diff --git a/dist/basic/jquery.qtip.css b/dist/basic/jquery.qtip.css index 18c63bb5..0eb5749f 100644 --- a/dist/basic/jquery.qtip.css +++ b/dist/basic/jquery.qtip.css @@ -1,4 +1,4 @@ -/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-02 +/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-15 * http://craigsworks.com/projects/qtip2/ * Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */ diff --git a/dist/basic/jquery.qtip.js b/dist/basic/jquery.qtip.js index 1202ffae..0b03d09c 100644 --- a/dist/basic/jquery.qtip.js +++ b/dist/basic/jquery.qtip.js @@ -1,4 +1,4 @@ -/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-02 +/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-15 * http://craigsworks.com/projects/qtip2/ * Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */ diff --git a/dist/jquery.qtip.css b/dist/jquery.qtip.css index 04df3387..ebbb857a 100644 --- a/dist/jquery.qtip.css +++ b/dist/jquery.qtip.css @@ -1,4 +1,4 @@ -/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-02 +/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-15 * http://craigsworks.com/projects/qtip2/ * Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */ @@ -589,3 +589,8 @@ -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; } + +/* IE6 Modal plugin fix */ +#qtip-overlay.ie6-fix{ + position: absolute !important; +} \ No newline at end of file diff --git a/dist/jquery.qtip.js b/dist/jquery.qtip.js index a477c069..b1fa9499 100644 --- a/dist/jquery.qtip.js +++ b/dist/jquery.qtip.js @@ -1,4 +1,4 @@ -/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-02 +/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-15 * http://craigsworks.com/projects/qtip2/ * Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */ @@ -2767,7 +2767,7 @@ function Modal(api) create: function() { - var elem = $(overlaySelector); + var elem = $(overlaySelector), win = $(window); // Return if overlay is already rendered if(elem.length) { @@ -2787,11 +2787,11 @@ function Modal(api) // Update position on window resize or scroll function resize() { overlay.css({ - height: $(window).height(), - width: $(window).width() + height: win.height(), + width: win.width() }); } - $(window).unbind(globalNamespace).bind('resize'+globalNamespace, resize); + win.unbind(globalNamespace).bind('resize'+globalNamespace, resize); resize(); // Fire it initially too return overlay; @@ -3220,6 +3220,7 @@ function IE6(api) namespace = '.ie6-' + api.id, bgiframe = $('select, object').length < 1, isDrawing = 0, + modalProcessed = FALSE, redrawContainer; api.checks.ie6 = { @@ -3229,6 +3230,8 @@ function IE6(api) $.extend(self, { init: function() { + var win = $(window), scroll; + // Create the BGIFrame element if needed if(bgiframe) { elems.bgiframe = $('",{"class":"qtip-close "+(a.style.widget?"":S+"-icon"),title:n,"aria-label":n}).prepend(r("",{"class":"ui-icon ui-icon-close",html:"×"})),j.button.appendTo(j.titlebar).attr("role","button").click(function(e){return P.hasClass(B)||m.hide(e),s})}function z(){var e=y+"-title";j.titlebar&&R(),j.titlebar=r("
",{"class":S+"-titlebar "+(a.style.widget?"ui-widget-header":"")}).append(j.title=r("",{id:e,"class":S+"-title","aria-atomic":i})).insertBefore(j.content).delegate(".qtip-close","mousedown keydown mouseup keyup mouseout",function(e){r(this).toggleClass("ui-state-active ui-state-focus",e.type.substr(-4)==="down")}).delegate(".qtip-close","mouseover mouseout",function(e){r(this).toggleClass("ui-state-hover",e.type==="mouseover")}),a.content.title.button&&U()}function W(e){var t=j.button,n=j.title;if(!m.rendered)return s;e?(n||z(),U()):t.remove()}function X(e,t){var n=j.title;if(!m.rendered||!e)return s;r.isFunction(e)&&(e=e.call(u,F.event,m));if(e===s||!e&&e!=="")return R(s);e.jquery&&e.length>0?n.empty().append(e.css({display:"block"})):n.html(e),t!==s&&m.rendered&&P[0].offsetWidth>0&&m.reposition(F.event)}function V(e,t){function o(e){function a(n){n&&(delete u[n.src],clearTimeout(m.timers.img[n.src]),r(n).unbind(H)),r.isEmptyObject(u)&&(t!==s&&m.reposition(F.event),e())}var o,u={};if((o=i.find("img[src]:not([height]):not([width])")).length===0)return a();o.each(function(e,t){if(u[t.src]!==n)return;var i=0,s=3;(function o(){if(t.height||t.width||i>s)return a(t);i+=1,m.timers.img[t.src]=setTimeout(o,700)})(),r(t).bind("error"+H+" load"+H,function(){a(this)}),u[t.src]=t})}var i=j.content;return!m.rendered||!e?s:(r.isFunction(e)&&(e=e.call(u,F.event,m)||""),e.jquery&&e.length>0?i.empty().append(e.css({display:"block"})):i.html(e),m.rendered<0?P.queue("fx",o):(D=0,o(r.noop)),m)}function J(){function h(e){if(P.hasClass(B))return s;clearTimeout(m.timers.show),clearTimeout(m.timers.hide);var t=function(){m.toggle(i,e)};a.show.delay>0?m.timers.show=setTimeout(t,a.show.delay):t()}function p(e){if(P.hasClass(B)||A||D)return s;var t=r(e.relatedTarget||e.target),i=t.closest(N)[0]===P[0],u=t[0]===o.show[0];clearTimeout(m.timers.show),clearTimeout(m.timers.hide);if(n.target==="mouse"&&i||a.hide.fixed&&/mouse(out|leave|move)/.test(e.type)&&(i||u)){try{e.preventDefault(),e.stopImmediatePropagation()}catch(f){}return}a.hide.delay>0?m.timers.hide=setTimeout(function(){m.hide(e)},a.hide.delay):m.hide(e)}function d(e){if(P.hasClass(B))return s;clearTimeout(m.timers.inactive),m.timers.inactive=setTimeout(function(){m.hide(e)},a.hide.inactive)}function v(e){m.rendered&&P[0].offsetWidth>0&&m.reposition(e)}var n=a.position,o={show:a.show.target,hide:a.hide.target,viewport:r(n.viewport),document:r(t),body:r(t.body),window:r(e)},l={show:r.trim(""+a.show.event).split(" "),hide:r.trim(""+a.hide.event).split(" ")},c=r.browser.msie&&parseInt(r.browser.version,10)===6;P.bind("mouseenter"+H+" mouseleave"+H,function(e){var t=e.type==="mouseenter";t&&m.focus(e),P.toggleClass(L,t)}),/mouse(out|leave)/i.test(a.hide.event)&&a.hide.leave==="window"&&o.window.bind("mouseout"+H+" blur"+H,function(e){!/select|option/.test(e.target.nodeName)&&!e.relatedTarget&&m.hide(e)}),a.hide.fixed?(o.hide=o.hide.add(P),P.bind("mouseover"+H,function(){P.hasClass(B)||clearTimeout(m.timers.hide)})):/mouse(over|enter)/i.test(a.show.event)&&o.hide.bind("mouseleave"+H,function(e){clearTimeout(m.timers.show)}),(""+a.hide.event).indexOf("unfocus")>-1&&n.container.closest("html").bind("mousedown"+H+" touchstart"+H,function(e){var t=r(e.target),n=m.rendered&&!P.hasClass(B)&&P[0].offsetWidth>0,i=t.parents(N).filter(P[0]).length>0;t[0]!==u[0]&&t[0]!==P[0]&&!i&&!u.has(t[0]).length&&!t.attr("disabled")&&m.hide(e)}),"number"==typeof a.hide.inactive&&(o.show.bind("qtip-"+f+"-inactive",d),r.each(b.inactiveEvents,function(e,t){o.hide.add(j.tooltip).bind(t+H+"-inactive",d)})),r.each(l.hide,function(e,t){var n=r.inArray(t,l.show),i=r(o.hide);n>-1&&i.add(o.show).length===i.length||t==="unfocus"?(o.show.bind(t+H,function(e){P[0].offsetWidth>0?p(e):h(e)}),delete l.show[n]):o.hide.bind(t+H,p)}),r.each(l.show,function(e,t){o.show.bind(t+H,h)}),"number"==typeof a.hide.distance&&o.show.add(P).bind("mousemove"+H,function(e){var t=F.origin||{},n=a.hide.distance,r=Math.abs;(r(e.pageX-t.pageX)>=n||r(e.pageY-t.pageY)>=n)&&m.hide(e)}),n.target==="mouse"&&(o.show.bind("mousemove"+H,function(e){E={pageX:e.pageX,pageY:e.pageY,type:"mousemove"}}),n.adjust.mouse&&(a.hide.event&&(P.bind("mouseleave"+H,function(e){(e.relatedTarget||e.target)!==o.show[0]&&m.hide(e)}),j.target.bind("mouseenter"+H+" mouseleave"+H,function(e){F.onTarget=e.type==="mouseenter"})),o.document.bind("mousemove"+H,function(e){m.rendered&&F.onTarget&&!P.hasClass(B)&&P[0].offsetWidth>0&&m.reposition(e||E)}))),(n.adjust.resize||o.viewport.length)&&(r.event.special.resize?o.viewport:o.window).bind("resize"+H,v),(o.viewport.length||c&&P.css("position")==="fixed")&&o.viewport.bind("scroll"+H,v)}function K(){var n=[a.show.target[0],a.hide.target[0],m.rendered&&j.tooltip[0],a.position.container[0],a.position.viewport[0],a.position.container.closest("html")[0],e,t];m.rendered?r([]).pushStack(r.grep(n,function(e){return typeof e=="object"})).unbind(H):a.show.target.unbind(H+"-create")}var m=this,g=t.body,y=S+"-"+f,A=0,D=0,P=r(),H=".qtip-"+f,B="qtip-disabled",j,F;m.id=f,m.rendered=s,m.destroyed=s,m.elements=j={target:u},m.timers={img:{}},m.options=a,m.checks={},m.plugins={},m.cache=F={event:{},target:r(),disabled:s,attr:l,onTarget:s,lastClass:""},m.checks.builtin={"^id$":function(e,t,n){var o=n===i?b.nextid:n,u=S+"-"+o;o!==s&&o.length>0&&!r("#"+u).length&&(P[0].id=u,j.content[0].id=u+"-content",j.title[0].id=u+"-title")},"^content.text$":function(e,t,n){V(n)},"^content.title.text$":function(e,t,n){if(!n)return R();!j.title&&n&&z(),X(n)},"^content.title.button$":function(e,t,n){W(n)},"^position.(my|at)$":function(e,t,n){"string"==typeof n&&(e[t]=new w.Corner(n))},"^position.container$":function(e,t,n){m.rendered&&P.appendTo(n)},"^show.ready$":function(){m.rendered?m.toggle(i):m.render(1)},"^style.classes$":function(e,t,n){P.attr("class",S+" qtip "+n)},"^style.width|height":function(e,t,n){P.css(t,n)},"^style.widget|content.title":q,"^events.(render|show|move|hide|focus|blur)$":function(e,t,n){P[(r.isFunction(n)?"":"un")+"bind"]("tooltip"+t,n)},"^(show|hide|position).(event|target|fixed|inactive|leave|distance|viewport|adjust)":function(){var e=a.position;P.attr("tracking",e.target==="mouse"&&e.adjust.mouse),K(),J()}},r.extend(m,{_triggerEvent:function(e,t,n){var i=r.Event("tooltip"+e);return i.originalEvent=(n?r.extend({},n):o)||F.event||o,P.trigger(i,[m].concat(t||[])),!i.isDefaultPrevented()},render:function(e){if(m.rendered)return m;var t=a.content.text,n=a.content.title.text,o=a.position;return r.attr(u[0],"aria-describedby",y),P=j.tooltip=r("",{id:y,"class":[S,C,a.style.classes,S+"-pos-"+a.position.my.abbrev()].join(" "),width:a.style.width||"",height:a.style.height||"",tracking:o.target==="mouse"&&o.adjust.mouse,role:"alert","aria-live":"polite","aria-atomic":s,"aria-describedby":y+"-content","aria-hidden":i}).toggleClass(B,F.disabled).data("qtip",m).appendTo(a.position.container).append(j.content=r("",{"class":S+"-content",id:y+"-content","aria-atomic":i})),m.rendered=-1,A=1,n&&(z(),r.isFunction(n)||X(n,s)),r.isFunction(t)||V(t,s),m.rendered=i,q(),r.each(a.events,function(e,t){r.isFunction(t)&&P.bind(e==="toggle"?"tooltipshow tooltiphide":"tooltip"+e,t)}),r.each(w,function(){this.initialize==="render"&&this(m)}),J(),P.queue("fx",function(t){m._triggerEvent("render"),A=0,(a.show.ready||e)&&m.toggle(i,F.event,s),t()}),m},get:function(e){var t,n;switch(e.toLowerCase()){case"dimensions":t={height:P.outerHeight(s),width:P.outerWidth(s)};break;case"offset":t=w.offset(P,a.position.container);break;default:n=I(e.toLowerCase()),t=n[0][n[1]],t=t.precedance?t.string():t}return t},set:function(e,t){function h(e,t){var n,r,i;for(n in l)for(r in l[n])if(i=(new RegExp(r,"i")).exec(e))t.push(i),l[n][r].apply(m,t)}var n=/^position\.(my|at|adjust|target|container)|style|content|show\.ready/i,u=/^content\.(title|attr)|style/i,f=s,l=m.checks,c;return"string"==typeof e?(c=e,e={},e[c]=t):e=r.extend(i,{},e),r.each(e,function(t,i){var s=I(t.toLowerCase()),o;o=s[0][s[1]],s[0][s[1]]="object"==typeof i&&i.nodeType?r(i):i,e[t]=[s[0],s[1],i,o],f=n.test(t)||f}),_(a),A=1,r.each(e,h),A=0,m.rendered&&P[0].offsetWidth>0&&f&&m.reposition(a.position.target==="mouse"?o:F.event),m},toggle:function(e,n){function b(){e?(r.browser.msie&&P[0].style.removeAttribute("filter"),P.css("overflow",""),"string"==typeof u.autofocus&&r(u.autofocus,P).focus(),u.target.trigger("qtip-"+f+"-inactive")):P.css({display:"",visibility:"",opacity:"",left:"",top:""}),m._triggerEvent(e?"visible":"hidden")}if(n){if(/over|enter/.test(n.type)&&/out|leave/.test(F.event.type)&&a.show.target.add(n.target).length===a.show.target.length&&P.has(n.relatedTarget).length)return m;F.event=r.extend({},n)}if(!m.rendered)return e?m.render(1):m;var o=e?"show":"hide",u=a[o],l=a[e?"hide":"show"],c=a.position,h=a.content,p=P[0].offsetWidth>0,d=e||u.target.length===1,v=!n||u.target.length<2||F.target[0]===n.target,g,y;return(typeof e).search("boolean|number")&&(e=!p),!P.is(":animated")&&p===e&&v?m:m._triggerEvent(o,[90])?(r.attr(P[0],"aria-hidden",!e),e?(F.origin=r.extend({},E),m.focus(n),r.isFunction(h.text)&&V(h.text,s),r.isFunction(h.title.text)&&X(h.title.text,s),!M&&c.target==="mouse"&&c.adjust.mouse&&(r(t).bind("mousemove.qtip",function(e){E={pageX:e.pageX,pageY:e.pageY,type:"mousemove"}}),M=i),m.reposition(n,arguments[2]),!u.solo||r(N,u.solo).not(P).qtip("hide",r.Event("tooltipsolo"))):(clearTimeout(m.timers.show),delete F.origin,M&&!r(N+'[tracking="true"]:visible',u.solo).not(P).length&&(r(t).unbind("mousemove.qtip"),M=s),m.blur(n)),u.effect===s||d===s?(P[o](),b.call(P)):r.isFunction(u.effect)?(P.stop(1,1),u.effect.call(P,m),P.queue("fx",function(e){b(),e()})):P.fadeTo(90,e?1:0,b),e&&u.target.trigger("qtip-"+f+"-inactive"),m):m},show:function(e){return m.toggle(i,e)},hide:function(e){return m.toggle(s,e)},focus:function(e){if(!m.rendered)return m;var t=r(N),n=parseInt(P[0].style.zIndex,10),i=b.zindex+t.length,s=r.extend({},e),o;return P.hasClass(k)||m._triggerEvent("focus",[i],s)&&(n!==i&&(t.each(function(){this.style.zIndex>n&&(this.style.zIndex=this.style.zIndex-1)}),t.filter("."+k).qtip("blur",s)),P.addClass(k)[0].style.zIndex=i),m},blur:function(e){return P.removeClass(k),m._triggerEvent("blur",[P.css("zIndex")],e),m},reposition:function(n,i){if(!m.rendered||A)return m;A=1;var o=a.position.target,u=a.position,f=u.my,l=u.at,g=u.adjust,y=g.method.split(" "),b=P.outerWidth(s),S=P.outerHeight(s),x=0,T=0,N=P.css("position")==="fixed",C=u.viewport,k={left:0,top:0},L=u.container,O=P[0].offsetWidth>0,M,_,D;if(r.isArray(o)&&o.length===2)l={x:h,y:c},k={left:o[0],top:o[1]};else if(o==="mouse"&&(n&&n.pageX||F.event.pageX))l={x:h,y:c},n=E&&E.pageX&&(g.mouse||!n||!n.pageX)?{pageX:E.pageX,pageY:E.pageY}:(!n||n.type!=="resize"&&n.type!=="scroll"?n&&n.pageX&&n.type==="mousemove"?n:!g.mouse&&F.origin&&F.origin.pageX&&a.show.distance?F.origin:n:F.event)||n||F.event||E||{},k={top:n.pageY,left:n.pageX};else{o==="event"&&n&&n.target&&n.type!=="scroll"&&n.type!=="resize"?F.target=r(n.target):o!=="event"&&(F.target=r(o.jquery?o:j.target)),o=F.target,o=r(o).eq(0);if(o.length===0)return m;o[0]===t||o[0]===e?(x=w.iOS?e.innerWidth:o.width(),T=w.iOS?e.innerHeight:o.height(),o[0]===e&&(k={top:(C||o).scrollTop(),left:(C||o).scrollLeft()})):w.imagemap&&o.is("area")?M=w.imagemap(m,o,l,w.viewport?y:s):w.svg&&typeof o[0].xmlbase=="string"?M=w.svg(m,o,l,w.viewport?y:s):(x=o.outerWidth(s),T=o.outerHeight(s),k=w.offset(o,L)),M&&(x=M.width,T=M.height,_=M.offset,k=M.position);if(w.iOS>3.1&&w.iOS<4.1||w.iOS>=4.3&&w.iOS<4.33||!w.iOS&&N)D=r(e),k.left-=D.scrollLeft(),k.top-=D.scrollTop();k.left+=l.x===d?x:l.x===v?x/2:0,k.top+=l.y===p?T:l.y===v?T/2:0}return k.left+=g.x+(f.x===d?-b:f.x===v?-b/2:0),k.top+=g.y+(f.y===p?-S:f.y===v?-S/2:0),w.viewport?(k.adjusted=w.viewport(m,k,u,x,T,b,S),_&&k.adjusted.left&&(k.left+=_.left),_&&k.adjusted.top&&(k.top+=_.top)):k.adjusted={left:0,top:0},m._triggerEvent("move",[k,C.elem||C],n)?(delete k.adjusted,i===s||!O||isNaN(k.left)||isNaN(k.top)||o==="mouse"||!r.isFunction(u.effect)?P.css(k):r.isFunction(u.effect)&&(u.effect.call(P,m,r.extend({},k)),P.queue(function(e){r(this).css({opacity:"",height:""}),r.browser.msie&&this.style.removeAttribute("filter"),e()})),A=0,m):m},disable:function(e){return"boolean"!=typeof e&&(e=!P.hasClass(B)&&!F.disabled),m.rendered?(P.toggleClass(B,e),r.attr(P[0],"aria-disabled",e)):F.disabled=!!e,m},enable:function(){return m.disable(s)},destroy:function(){var e=u[0],t=r.attr(e,O),n=u.data("qtip");m.destroyed=i,m.rendered&&(P.stop(1,0).remove(),r.each(m.plugins,function(){this.destroy&&this.destroy()})),clearTimeout(m.timers.show),clearTimeout(m.timers.hide),K();if(!n||m===n)r.removeData(e,"qtip"),a.suppress&&t&&(r.attr(e,"title",t),u.removeAttr(O)),u.removeAttr("aria-describedby");return u.unbind(".qtip-"+f),delete x[m.id],u}})}function P(e,n){var u,a,f,l,c,h=r(this),p=r(t.body),d=this===t?p:h,v=h.metadata?h.metadata(n.metadata):o,m=n.metadata.type==="html5"&&v?v[n.metadata.name]:o,g=h.data(n.metadata.name||"qtipopts");try{g=typeof g=="string"?r.parseJSON(g):g}catch(y){}l=r.extend(i,{},b.defaults,n,typeof g=="object"?_(g):o,_(m||v)),a=l.position,l.id=e;if("boolean"==typeof l.content.text){f=h.attr(l.content.attr);if(l.content.attr===s||!f)return s;l.content.text=f}a.container.length||(a.container=p),a.target===s&&(a.target=d),l.show.target===s&&(l.show.target=d),l.show.solo===i&&(l.show.solo=a.container.closest("body")),l.hide.target===s&&(l.hide.target=d),l.position.viewport===i&&(l.position.viewport=a.container),a.container=a.container.eq(0),a.at=new w.Corner(a.at),a.my=new w.Corner(a.my);if(r.data(this,"qtip"))if(l.overwrite)h.qtip("destroy");else if(l.overwrite===s)return s;return l.suppress&&(c=r.attr(this,"title"))&&r(this).removeAttr("title").attr(O,c).attr("title",""),u=new D(h,l,e,!!f),r.data(this,"qtip",u),h.bind("remove.qtip-"+e+" removeqtip.qtip-"+e,function(){u.destroy()}),u}function H(e){var t=this,n=e.elements.tooltip,o=e.options.content.ajax,u=b.defaults.content.ajax,a=".qtip-ajax",f=/