From: <jon...@us...> - 2009-10-16 17:03:22
|
Revision: 22387 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=22387&view=rev Author: jonnybradley Date: 2009-10-16 17:03:12 +0000 (Fri, 16 Oct 2009) Log Message: ----------- [MOD] Update jquery colorbox plugin to latest (1.3.1) (see http://colorpowered.com/colorbox/core/README for full info) Modified Paths: -------------- third_party/jquery/colorbox/jquery.colorbox-min.js third_party/jquery/colorbox/jquery.colorbox.js third_party/jquery/colorbox/styles/colorbox.css third_party/jquery/jquery-tiki-readme.txt Removed Paths: ------------- third_party/jquery/colorbox/styles/colorbox-ie.css Modified: third_party/jquery/colorbox/jquery.colorbox-min.js =================================================================== --- third_party/jquery/colorbox/jquery.colorbox-min.js 2009-10-16 17:01:16 UTC (rev 22386) +++ third_party/jquery/colorbox/jquery.colorbox-min.js 2009-10-16 17:03:12 UTC (rev 22387) @@ -1,3 +1,2 @@ -// ColorBox v1.2.9b - a full featured, light-weight, customizable lightbox based on jQuery 1.3 - -(function(C){var I,X,Y,d,A,k,b,H,c,T,F,f,s,j,m,R,l,J,t,E,Z,i,g,a,w,S,p,B,V,x,K,q="colorbox",o="hover",z,e,U,N,M,L,r,O,y="cbox_open",Q="cbox_load",u="cbox_complete",h="cbox_close",n="cbox_closed",D={transition:"elastic",speed:350,width:false,height:false,initialWidth:"400",initialHeight:"400",maxWidth:false,maxHeight:false,resize:true,inline:false,html:false,iframe:false,photo:false,href:false,title:false,rel:false,opacity:0.9,preloading:true,current:"image {current} of {total}",previous:"previous",next:"next",close:"close",open:false,overlayClose:true,slideshow:false,slideshowAuto:true,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow"};function P(aa){if(aa.keyCode===37){aa.preventDefault();J.click()}else{if(aa.keyCode===39){aa.preventDefault();l.click()}}}function G(aa,ab){ab=ab==="x"?document.documentElement.clientWidth:document.documentElement.clientHeight;return(typeof aa==="string")?(aa.match(/%/)?(ab/100)*parseInt(aa,10):parseInt(aa,10)):aa}function v(aa){return V.photo?true:aa.match(/\.(gif|png|jpg|jpeg|bmp)(?:\?([^#]*))?(?:#(\.*))?$/i)}function W(){for(var aa in V){if(typeof(V[aa])==="function"){V[aa]=V[aa].call(p)}}}C.fn.colorbox=function(ab,aa){if(this.length){this.each(function(){var ac=C(this).data(q)?C.extend({},C(this).data(q),ab):C.extend({},D,ab);C(this).data(q,ac).addClass("cboxelement")})}else{C(this).data(q,C.extend({},D,ab))}C(this).unbind("click.colorbox").bind("click.colorbox",function(ad){p=this;V=C(p).data(q);W();C().bind("keydown.cbox_close",function(ae){if(ae.keyCode===27){ae.preventDefault();t.click()}});if(V.overlayClose===true){I.css({cursor:"pointer"}).one("click",O)}p.blur();K=aa||false;var ac=V.rel||p.rel;if(ac&&ac!=="nofollow"){c=C(".cboxelement").filter(function(){var ae=C(this).data(q).rel||this.rel;return(ae===ac)});B=c.index(p);if(B<0){c=c.add(p);B=c.length-1}}else{c=C(p);B=0}if(!x){C.event.trigger(y);t.html(V.close);I.css({opacity:V.opacity}).show();x=true;M(G(V.initialWidth,"x"),G(V.initialHeight,"y"),0);if(C.browser.msie&&C.browser.version<7){T.bind("resize.cboxie6 scroll.cboxie6",function(){I.css({width:T.width(),height:T.height(),top:T.scrollTop(),left:T.scrollLeft()})}).trigger("scroll.cboxie6")}}r();N();ad.preventDefault()});if(ab&&ab.open){C(this).triggerHandler("click.colorbox")}return this};U=function(){function aa(ab){return C('<div id="cbox'+ab+'"/>')}T=C(window);X=C('<div id="colorbox"/>');I=aa("Overlay").hide();Y=aa("Wrapper");d=aa("Content").append(F=aa("LoadedContent").css({width:0,height:0}),f=aa("LoadingOverlay"),s=aa("LoadingGraphic"),j=aa("Title"),m=aa("Current"),R=aa("Slideshow"),l=aa("Next"),J=aa("Previous"),t=aa("Close"));Y.append(C("<div/>").append(aa("TopLeft"),A=aa("TopCenter"),aa("TopRight")),C("<div/>").append(k=aa("MiddleLeft"),d,b=aa("MiddleRight")),C("<div/>").append(aa("BottomLeft"),H=aa("BottomCenter"),aa("BottomRight"))).children().children().css({"float":"left"});C("body").prepend(I,X.append(Y));if(C.browser.msie&&C.browser.version<7){I.css("position","absolute")}d.children().addClass(o).mouseover(function(){C(this).addClass(o)}).mouseout(function(){C(this).removeClass(o)}).hide();Z=A.height()+H.height()+d.outerHeight(true)-d.height();i=k.width()+b.width()+d.outerWidth(true)-d.width();g=F.outerHeight(true);a=F.outerWidth(true);X.css({"padding-bottom":Z,"padding-right":i}).hide();l.click(e);J.click(z);t.click(O);d.children().removeClass(o)};M=function(ad,ac,ab,ae){var af=document.documentElement.clientHeight,ah=af/2-ac/2,ag=document.documentElement.clientWidth/2-ad/2,aa;if(ac>af){ah-=(ac-af)}if(ah<0){ah=0}if(ag<0){ag=0}ah+=T.scrollTop();ag+=T.scrollLeft();ad=ad-i;ac=ac-Z;aa=(X.width()===ad&&X.height()===ac)?0:ab;Y[0].style.width=Y[0].style.height="9999px";function ai(aj){A[0].style.width=H[0].style.width=d[0].style.width=aj.style.width;s[0].style.height=f[0].style.height=d[0].style.height=k[0].style.height=b[0].style.height=aj.style.height}X.dequeue().animate({height:ac,width:ad,top:ah,left:ag},{duration:aa,complete:function(){ai(this);Y[0].style.width=(ad+i)+"px";Y[0].style.height=(ac+Z)+"px";if(ae){ae()}},step:function(){ai(this)}})};L=function(af){if(!x){return}T.unbind("resize.cbox_resize");var ab,al,ag,ae,ac,ai,am,aa,ad=V.transition==="none"?0:V.speed;F.remove();F=C(af);function aj(){if(V.width){ab=w}else{ab=w&&w<F.width()?w:F.width()}return ab}function ah(){if(V.height){al=S}else{al=S&&S<F.height()?S:F.height()}return al}F.hide().appendTo("body").attr({id:"cboxLoadedContent"}).css({width:aj()}).css({height:ah()}).prependTo(d);if(C.browser.msie&&C.browser.version<7){C("select:not(#colorbox select)").filter(function(){return C(this).css("visibility")!=="hidden"}).css({visibility:"hidden"}).one(h,function(){C(this).css({visibility:"inherit"})})}aa=C("#cboxPhoto")[0];if(aa&&V.height){ag=(al-parseInt(aa.style.height,10))/2;aa.style.marginTop=(ag>0?ag:0)+"px"}function ak(ao){var an=ab+a+i,ap=al+g+Z;M(an,ap,ao,function(){if(!x){return}if(C.browser.msie){if(aa){F.fadeIn(100)}X.css("filter","")}d.children().show();C("#cboxIframeTemp").after("<iframe id='cboxIframe' name='iframe_"+new Date().getTime()+"' frameborder=0 src='"+(V.href||p.href)+"' />").remove();f.hide();s.hide();R.hide();if(c.length>1){m.html(V.current.replace(/\{current\}/,B+1).replace(/\{total\}/,c.length));l.html(V.next);J.html(V.previous);C().unbind("keydown",P).bind("keydown",P);if(V.slideshow){R.show()}}else{m.hide();l.hide();J.hide()}j.html(V.title||p.title);C.event.trigger(u);if(K){K.call(p)}if(V.transition==="fade"){X.fadeTo(ad,1,function(){if(C.browser.msie){d.css("filter","")}})}T.bind("resize.cbox_resize",function(){M(an,ap,0)})})}if(V.transition==="fade"){X.fadeTo(ad,0,function(){ak(0)})}else{ak(ad)}if(V.preloading&&c.length>1){ae=B>0?c[B-1]:c[c.length-1];ai=B<c.length-1?c[B+1]:c[0];am=C(ai).data(q).href||ai.href;ac=C(ae).data(q).href||ae.href;if(v(am)){C("<img />").attr("src",am)}if(v(ac)){C("<img />").attr("src",ac)}}};N=function(){var aa,ad,ab,ac;p=c[B];V=C(p).data(q);W();C.event.trigger(Q);aa=V.height?G(V.height,"y")-g-Z:false;ad=V.width?G(V.width,"x")-a-i:false;ab=V.href||p.href;f.show();s.show();t.show();if(V.maxHeight){S=V.maxHeight?G(V.maxHeight,"y")-g-Z:false;aa=aa&&aa<S?aa:S}if(V.maxWidth){w=V.maxWidth?G(V.maxWidth,"x")-a-i:false;ad=ad&&ad<w?ad:w}S=aa;w=ad;if(V.inline){C('<div id="cboxInlineTemp" />').hide().insertBefore(C(ab)[0]).bind(Q+" "+h,function(){F.children().insertBefore(this);C(this).remove()});L(C(ab).wrapAll("<div/>").parent())}else{if(V.iframe){L(C("<div><div id='cboxIframeTemp' /></div>"))}else{if(V.html){L(C("<div/>").html(V.html))}else{if(v(ab)){ac=new Image();ac.onload=function(){ac.onload=null;if((S||w)&&V.resize){var ag=this.width,ae=this.height,ai=0,ah=this,af=function(){ae+=ae*ai;ag+=ag*ai;ah.height=ae;ah.width=ag};if(w&&ag>w){ai=(w-ag)/ag;af()}if(S&&ae>S){ai=(S-ae)/ae;af()}}L(C("<div />").css({width:this.width,height:this.height}).append(C(this).css({width:this.width,height:this.height,display:"block",margin:"auto",border:0}).attr("id","cboxPhoto")));if(c.length>1){C(this).css({cursor:"pointer"}).click(e)}if(C.browser.msie&&C.browser.version==7){this.style.msInterpolationMode="bicubic"}};ac.src=ab}else{C("<div />").load(ab,function(ae,af){if(af==="success"){L(C(this))}else{L(C("<p>Request unsuccessful.</p>"))}})}}}}};e=function(){B=B<c.length-1?B+1:0;N()};z=function(){B=B>0?B-1:c.length-1;N()};r=function(){var ab,aa,ac="cboxSlideshow_";R.bind(h,function(){clearTimeout(aa);R.unbind()});function ad(){R.text(V.slideshowStop).bind(u,function(){aa=setTimeout(e,V.slideshowSpeed)}).bind(Q,function(){clearTimeout(aa)}).one("click",function(){ab();C(this).removeClass(o)});X.removeClass(ac+"off").addClass(ac+"on")}ab=function(){clearTimeout(aa);R.text(V.slideshowStart).unbind(u+" "+Q).one("click",function(){ad();aa=setTimeout(e,V.slideshowSpeed);C(this).removeClass(o)});X.removeClass(ac+"on").addClass(ac+"off")};if(V.slideshow&&c.length>1){if(V.slideshowAuto){ad()}else{ab()}}};O=function(){C.event.trigger(h);x=false;C().unbind("keydown",P).unbind("keydown.cbox_close");T.unbind("resize.cbox_resize resize.cboxie6 scroll.cboxie6");I.css({cursor:"auto"}).fadeOut("fast");d.children().hide();X.stop(true,false).removeClass().fadeOut("fast",function(){F.remove();X.css({opacity:1});C.event.trigger(n)})};E=C.fn.colorbox;E.init=U;E.next=e;E.prev=z;E.close=O;E.load=N;E.position=M;E.dimensions=L;E.element=function(){return p};E.settings=D;C(function(){U()})}(jQuery)); \ No newline at end of file +/* ColorBox v1.3.1 - a full featured, light-weight, customizable lightbox based on jQuery 1.3 */ +(function(A){var p="colorbox",n="hover",w=true,R=false,X,l=!A.support.opacity,T=l&&!window.XMLHttpRequest,W="click.colorbox",x="cbox_open",L="cbox_load",s="cbox_complete",K="cbox_cleanup",m="cbox_closed",O="resize.cbox_resize",I="resize.cboxie6 scroll.cboxie6",F,U,V,d,y,i,b,E,c,P,C,f,q,h,k,M,j,H,r,Y,g,e,a,v,N,o,z,Q,u,G,B={transition:"elastic",speed:350,width:R,height:R,initialWidth:"400",initialHeight:"400",maxWidth:R,maxHeight:R,scalePhotos:w,scrollbars:w,inline:R,html:R,iframe:R,photo:R,href:R,title:R,rel:R,opacity:0.9,preloading:w,current:"image {current} of {total}",previous:"previous",next:"next",close:"close",open:R,overlayClose:w,slideshow:R,slideshowAuto:w,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow"};function J(Z){if(Z.keyCode===37){Z.preventDefault();H.click()}else{if(Z.keyCode===39){Z.preventDefault();j.click()}}}function D(Z,aa){aa=aa==="x"?document.documentElement.clientWidth:document.documentElement.clientHeight;return(typeof Z==="string")?(Z.match(/%/)?(aa/100)*parseInt(Z,10):parseInt(Z,10)):Z}function t(Z){return Q.photo||Z.match(/\.(gif|png|jpg|jpeg|bmp)(?:\?([^#]*))?(?:#(\.*))?$/i)}function S(){for(var Z in Q){if(typeof(Q[Z])==="function"){Q[Z]=Q[Z].call(o)}}}X=A.fn.colorbox=function(aa,Z){if(this.length){this.each(function(){var ab=A(this).data(p)?A.extend({},A(this).data(p),aa):A.extend({},B,aa);A(this).data(p,ab).addClass("cboxelement")})}else{A(this).data(p,A.extend({},B,aa))}A(this).unbind(W).bind(W,function(ac){o=this;Q=A(o).data(p);S();A().bind("keydown.cbox_close",function(ad){if(ad.keyCode===27){ad.preventDefault();X.close()}});if(Q.overlayClose){F.css({cursor:"pointer"}).one("click",X.close)}o.blur();G=Z||R;var ab=Q.rel||o.rel;if(ab&&ab!=="nofollow"){c=A(".cboxelement").filter(function(){var ad=A(this).data(p).rel||this.rel;return(ad===ab)});z=c.index(o);if(z<0){c=c.add(o);z=c.length-1}}else{c=A(o);z=0}if(!u){u=w;A.event.trigger(x);r.html(Q.close);F.css({opacity:Q.opacity}).show();X.position(D(Q.initialWidth,"x"),D(Q.initialHeight,"y"),0);if(T){P.bind(I,function(){F.css({width:P.width(),height:P.height(),top:P.scrollTop(),left:P.scrollLeft()})}).trigger(I)}}X.slideshow();X.load();ac.preventDefault()});if(aa&&aa.open){A(this).triggerHandler(W)}return this};X.init=function(){function Z(aa){return A('<div id="cbox'+aa+'"/>')}P=A(window);U=A('<div id="colorbox"/>');F=Z("Overlay").hide();V=Z("Wrapper");d=Z("Content").append(C=Z("LoadedContent").css({width:0,height:0}),f=Z("LoadingOverlay"),q=Z("LoadingGraphic"),h=Z("Title"),k=Z("Current"),M=Z("Slideshow"),j=Z("Next"),H=Z("Previous"),r=Z("Close"));V.append(A("<div/>").append(Z("TopLeft"),y=Z("TopCenter"),Z("TopRight")),A("<div/>").append(i=Z("MiddleLeft"),d,b=Z("MiddleRight")),A("<div/>").append(Z("BottomLeft"),E=Z("BottomCenter"),Z("BottomRight"))).children().children().css({"float":"left"});A("body").prepend(F,U.append(V));if(l){U.addClass("cboxIE");if(T){F.css("position","absolute")}}d.children().addClass(n).mouseover(function(){A(this).addClass(n)}).mouseout(function(){A(this).removeClass(n)}).hide();Y=y.height()+E.height()+d.outerHeight(w)-d.height();g=i.width()+b.width()+d.outerWidth(w)-d.width();e=C.outerHeight(w);a=C.outerWidth(w);U.css({"padding-bottom":Y,"padding-right":g}).hide();j.click(X.next);H.click(X.prev);r.click(X.close);d.children().removeClass(n)};X.position=function(ac,ab,aa,ad){var ae=document.documentElement.clientHeight,ag=ae/2-ab/2,af=document.documentElement.clientWidth/2-ac/2,Z;if(ab>ae){ag-=(ab-ae)}if(ag<0){ag=0}if(af<0){af=0}ag+=P.scrollTop();af+=P.scrollLeft();ac=ac-g;ab=ab-Y;Z=(U.width()===ac&&U.height()===ab)?0:aa;V[0].style.width=V[0].style.height="9999px";function ah(ai){y[0].style.width=E[0].style.width=d[0].style.width=ai.style.width;q[0].style.height=f[0].style.height=d[0].style.height=i[0].style.height=b[0].style.height=ai.style.height}U.dequeue().animate({height:ab,width:ac,top:ag,left:af},{duration:Z,complete:function(){ah(this);V[0].style.width=(ac+g)+"px";V[0].style.height=(ab+Y)+"px";if(ad){ad()}},step:function(){ah(this)}})};X.resize=function(ae){if(!u){return}var aa,al,af,ad,ab,ah,am,Z,aj,ac=Q.transition==="none"?0:Q.speed;P.unbind(O);if(!ae){aj=setTimeout(function(){al=C.children().outerHeight(w);C[0].style.height=al+"px";X.position(C.width()+a+g,al+e+Y,ac)},1);return}C.remove();C=A(ae);function ai(){aa=Q.width?v:v&&v<C.width()?v:C.width();return aa}function ag(){al=Q.height?N:N&&N<C.height()?N:C.height();return al}if(!Q.scrollbars){C.css({overflow:"hidden"})}C.hide().appendTo("body").attr({id:"cboxLoadedContent"}).css({width:ai()}).css({height:ag()}).prependTo(d);if(T){A("select:not(#colorbox select)").filter(function(){return A(this).css("visibility")!=="hidden"}).css({visibility:"hidden"}).one(K,function(){A(this).css({visibility:"inherit"})})}Z=A("#cboxPhoto")[0];if(Z&&Q.height){af=(al-parseInt(Z.style.height,10))/2;Z.style.marginTop=(af>0?af:0)+"px"}function ak(ao){var an=aa+a+g,ap=al+e+Y;A().unbind("keydown",J);X.position(an,ap,ao,function(){if(!u){return}if(l){if(Z){C.fadeIn(100)}U[0].style.removeAttribute("filter")}d.children().show();A("#cboxIframeTemp").after("<iframe id='cboxIframe' name='iframe_"+new Date().getTime()+"' frameborder=0 src='"+(Q.href||o.href)+"' />").remove();f.hide();q.hide();M.hide();if(c.length>1){k.html(Q.current.replace(/\{current\}/,z+1).replace(/\{total\}/,c.length));j.html(Q.next);H.html(Q.previous);A().bind("keydown",J);if(Q.slideshow){M.show()}}else{k.hide();j.hide();H.hide()}h.html(Q.title||o.title);A.event.trigger(s);if(G){G.call(o)}if(Q.transition==="fade"){U.fadeTo(ac,1,function(){if(l){U[0].style.removeAttribute("filter")}})}P.bind(O,function(){X.position(an,ap,0)})})}if((Q.transition==="fade"&&U.fadeTo(ac,0,function(){ak(0)}))||ak(ac)){}if(Q.preloading&&c.length>1){ad=z>0?c[z-1]:c[c.length-1];ah=z<c.length-1?c[z+1]:c[0];am=A(ah).data(p).href||ah.href;ab=A(ad).data(p).href||ad.href;if(t(am)){A("<img />").attr("src",am)}if(t(ab)){A("<img />").attr("src",ab)}}};X.load=function(){var Z,ad,aa,ac,ab=X.resize;o=c[z];Q=A(o).data(p);S();A.event.trigger(L);Z=Q.height?D(Q.height,"y")-e-Y:R;ad=Q.width?D(Q.width,"x")-a-g:R;aa=Q.href||o.href;f.show();q.show();r.show();if(Q.maxHeight){N=Q.maxHeight?D(Q.maxHeight,"y")-e-Y:R;Z=Z&&Z<N?Z:N}if(Q.maxWidth){v=Q.maxWidth?D(Q.maxWidth,"x")-a-g:R;ad=ad&&ad<v?ad:v}N=Z;v=ad;if(Q.inline){A('<div id="cboxInlineTemp" />').hide().insertBefore(A(aa)[0]).bind(L+" "+K,function(){C.children().insertBefore(this);A(this).remove()});ab(A(aa).wrapAll("<div/>").parent())}else{if(Q.iframe){ab(A("<div><div id='cboxIframeTemp' /></div>"))}else{if(Q.html){ab(A("<div/>").html(Q.html))}else{if(t(aa)){ac=new Image();ac.onload=function(){ac.onload=null;if((N||v)&&Q.scalePhotos){var ag=this.width,ae=this.height,ai=0,ah=this,af=function(){ae+=ae*ai;ag+=ag*ai;ah.height=ae;ah.width=ag};if(v&&ag>v){ai=(v-ag)/ag;af()}if(N&&ae>N){ai=(N-ae)/ae;af()}}ab(A("<div />").css({width:this.width,height:this.height}).append(A(this).css({width:this.width,height:this.height,display:"block",margin:"auto",border:0}).attr("id","cboxPhoto")));if(c.length>1){A(this).css({cursor:"pointer"}).click(X.next)}if(l){this.style.msInterpolationMode="bicubic"}};ac.src=aa}else{A("<div />").load(aa,function(ae,af){if(af==="success"){ab(A(this))}else{ab(A("<p>Request unsuccessful.</p>"))}})}}}}};X.next=function(){z=z<c.length-1?z+1:0;X.load()};X.prev=function(){z=z>0?z-1:c.length-1;X.load()};X.slideshow=function(){var aa,Z,ab="cboxSlideshow_";M.bind(K,function(){clearTimeout(Z);M.unbind(s+" "+L+" click")});function ac(){M.text(Q.slideshowStop).bind(s,function(){Z=setTimeout(X.next,Q.slideshowSpeed)}).bind(L,function(){clearTimeout(Z)}).one("click",function(){aa();A(this).removeClass(n)});U.removeClass(ab+"off").addClass(ab+"on")}aa=function(){clearTimeout(Z);M.text(Q.slideshowStart).unbind(s+" "+L).one("click",function(){ac();Z=setTimeout(X.next,Q.slideshowSpeed);A(this).removeClass(n)});U.removeClass(ab+"on").addClass(ab+"off")};if(Q.slideshow&&c.length>1){if(Q.slideshowAuto){ac()}else{aa()}}};X.close=function(){A.event.trigger(K);u=R;A().unbind("keydown",J).unbind("keydown.cbox_close");P.unbind(O+" "+I);F.css({cursor:"auto"}).fadeOut("fast");U.stop(w,R).fadeOut("fast",function(){C.remove();U.css({opacity:1});d.children().hide();A.event.trigger(m)})};X.element=function(){return o};X.settings=B;A(X.init)}(jQuery)); \ No newline at end of file Modified: third_party/jquery/colorbox/jquery.colorbox.js =================================================================== --- third_party/jquery/colorbox/jquery.colorbox.js 2009-10-16 17:01:16 UTC (rev 22386) +++ third_party/jquery/colorbox/jquery.colorbox.js 2009-10-16 17:03:12 UTC (rev 22387) @@ -1,55 +1,91 @@ -/* - ColorBox v1.2.9b - a full featured, light-weight, customizable lightbox based on jQuery 1.3 - (c) 2009 Jack Moore - www.colorpowered.com - ja...@co... - Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php -*/ +/*! ColorBox v1.3.1 - a full featured, light-weight, customizable lightbox based on jQuery 1.3 */ +// (c) 2009 Jack Moore - www.colorpowered.com - ja...@co... +// Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php + (function ($) { - - // **************** - // COMMON VARIABLES - // **************** - - //jQuery Object Variables - var $overlay, $cbox, $wrap, $content, $topBorder, $leftBorder, $rightBorder, $bottomBorder, $related, $window, $loaded, $loadingOverlay, $loadingGraphic, $title, $current, $slideshow, $next, $prev, $close, - - //Variables - publicMethod, interfaceHeight, interfaceWidth, loadedHeight, loadedWidth, maxWidth, maxHeight, element, index, settings, open, callback, colorbox = 'colorbox', hover = 'hover', + //Shortcuts (to increase compression) + var colorbox = 'colorbox', + hover = 'hover', + TRUE = true, + FALSE = false, + cboxPublic, + isIE = !$.support.opacity, + isIE6 = isIE && !window.XMLHttpRequest, - //Functions - prev, next, init, load, position, dimensions, slideshow, close, + //Event Strings (to increase compression) + cbox_click = 'click.colorbox', + cbox_open = 'cbox_open', + cbox_load = 'cbox_load', + cbox_complete = 'cbox_complete', + cbox_cleanup = 'cbox_cleanup', + cbox_closed = 'cbox_closed', + cbox_resize = 'resize.cbox_resize', + cbox_ie6 = 'resize.cboxie6 scroll.cboxie6', + + //Cached jQuery Object Variables + $overlay, + $cbox, + $wrap, + $content, + $topBorder, + $leftBorder, + $rightBorder, + $bottomBorder, + $related, + $window, + $loaded, + $loadingOverlay, + $loadingGraphic, + $title, + $current, + $slideshow, + $next, + $prev, + $close, + + //Variables for cached values or use across multiple functions + interfaceHeight, + interfaceWidth, + loadedHeight, + loadedWidth, + maxWidth, + maxHeight, + element, + index, + settings, + open, + callback, - //Events - cbox_open = 'cbox_open', cbox_load = 'cbox_load', cbox_complete = 'cbox_complete', cbox_close = 'cbox_close', cbox_closed = 'cbox_closed', - // ColorBox Default Settings. // See http://colorpowered.com/colorbox for details. defaults = { transition: "elastic", speed: 350, - width: false, - height: false, + width: FALSE, + height: FALSE, initialWidth: "400", initialHeight: "400", - maxWidth: false, - maxHeight: false, - resize: true, - inline: false, - html: false, - iframe: false, - photo: false, - href: false, - title: false, - rel: false, + maxWidth: FALSE, + maxHeight: FALSE, + scalePhotos: TRUE, + scrollbars: TRUE, + inline: FALSE, + html: FALSE, + iframe: FALSE, + photo: FALSE, + href: FALSE, + title: FALSE, + rel: FALSE, opacity: 0.9, - preloading: true, + preloading: TRUE, current: "image {current} of {total}", previous: "previous", next: "next", close: "close", - open: false, - overlayClose: true, - slideshow: false, - slideshowAuto: true, + open: FALSE, + overlayClose: TRUE, + slideshow: FALSE, + slideshowAuto: TRUE, slideshowSpeed: 2500, slideshowStart: "start slideshow", slideshowStop: "stop slideshow" @@ -59,7 +95,7 @@ // HELPER FUNCTIONS // **************** - // Set Navigation Keys + // Set Navigation Key Bindings function cbox_key(e) { if (e.keyCode === 37) { e.preventDefault(); @@ -69,21 +105,21 @@ $next.click(); } } - + // Convert % values to pixels - function setSize(size, dimension) { + function setSize (size, dimension) { dimension = dimension === 'x' ? document.documentElement.clientWidth : document.documentElement.clientHeight; return (typeof size === 'string') ? (size.match(/%/) ? (dimension / 100) * parseInt(size, 10) : parseInt(size, 10)) : size; } // Checks an href to see if it is a photo. - // There is a force photo option for hrefs that cannot be matched by this regex. - function isImage(url) { - return settings.photo ? true : url.match(/\.(gif|png|jpg|jpeg|bmp)(?:\?([^#]*))?(?:#(\.*))?$/i); + // There is a force photo option (photo: true) for hrefs that cannot be matched by this regex. + function isImage (url) { + return settings.photo || url.match(/\.(gif|png|jpg|jpeg|bmp)(?:\?([^#]*))?(?:#(\.*))?$/i); } // Assigns functions results to their respective settings. This allows functions to be used to set ColorBox options. - function process() { + function process () { for (var i in settings) { if (typeof(settings[i]) === 'function') { settings[i] = settings[i].call(element); @@ -91,7 +127,13 @@ } } - $.fn.colorbox = function (options, custom_callback) { + // **************** + // PUBLIC FUNCTIONS + // Usage format: $.fn.colorbox.close(); + // Usage from within an iframe: parent.$.fn.colorbox.close(); + // **************** + + cboxPublic = $.fn.colorbox = function (options, custom_callback) { if (this.length) { this.each(function () { @@ -103,7 +145,7 @@ $(this).data(colorbox, $.extend({}, defaults, options)); } - $(this).unbind("click.colorbox").bind("click.colorbox", function (event) { + $(this).unbind(cbox_click).bind(cbox_click, function (event) { element = this; @@ -114,11 +156,11 @@ $().bind("keydown.cbox_close", function (e) { if (e.keyCode === 27) { e.preventDefault(); - $close.click(); + cboxPublic.close(); } }); - if (settings.overlayClose === true) { - $overlay.css({"cursor": "pointer"}).one('click', close); + if (settings.overlayClose) { + $overlay.css({"cursor": "pointer"}).one('click', cboxPublic.close); } //remove the focus from the anchor to prevent accidentally calling @@ -126,7 +168,7 @@ //after colorbox has opened, but before the user has clicked on anything else) element.blur(); - callback = custom_callback || false; + callback = custom_callback || FALSE; var rel = settings.rel || element.rel; @@ -147,39 +189,40 @@ index = 0; } if (!open) { + open = TRUE; $.event.trigger(cbox_open); $close.html(settings.close); $overlay.css({"opacity": settings.opacity}).show(); - open = true; - position(setSize(settings.initialWidth, 'x'), setSize(settings.initialHeight, 'y'), 0); - if ($.browser.msie && $.browser.version < 7) { - $window.bind("resize.cboxie6 scroll.cboxie6", function () { + cboxPublic.position(setSize(settings.initialWidth, 'x'), setSize(settings.initialHeight, 'y'), 0); + if (isIE6) { + $window.bind(cbox_ie6, function () { $overlay.css({width: $window.width(), height: $window.height(), top: $window.scrollTop(), left: $window.scrollLeft()}); - }).trigger('scroll.cboxie6'); + }).trigger(cbox_ie6); } } - slideshow(); - load(); + cboxPublic.slideshow(); + cboxPublic.load(); event.preventDefault(); }); if (options && options.open) { - $(this).triggerHandler('click.colorbox'); + $(this).triggerHandler(cbox_click); } return this; }; - // Initialize ColorBox: store common calculations, preload the interface graphics, append the html. // This preps colorbox for a speedy open when clicked, and lightens the burdon on the browser by only // having to run once, instead of each time colorbox is opened. - init = function () { + cboxPublic.init = function () { + // jQuery object generator to save a bit of space function $div(id) { return $('<div id="cbox' + id + '"/>'); } + // Create & Append jQuery Objects $window = $(window); $cbox = $('<div id="colorbox"/>'); @@ -214,9 +257,12 @@ ) ).children().children().css({'float': 'left'}); $('body').prepend($overlay, $cbox.append($wrap)); - - if ($.browser.msie && $.browser.version < 7) { - $overlay.css('position', 'absolute'); + + if (isIE) { + $cbox.addClass('cboxIE'); + if (isIE6) { + $overlay.css('position', 'absolute'); + } } // Add rollover event to navigation elements @@ -227,25 +273,25 @@ .hide(); // Cache values needed for size calculations - interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(true) - $content.height();//Subtraction needed for IE6 - interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(true) - $content.width(); - loadedHeight = $loaded.outerHeight(true); - loadedWidth = $loaded.outerWidth(true); + interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(TRUE) - $content.height();//Subtraction needed for IE6 + interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(TRUE) - $content.width(); + loadedHeight = $loaded.outerHeight(TRUE); + loadedWidth = $loaded.outerWidth(TRUE); // Setting padding to remove the need to do size conversions during the animation step. $cbox.css({"padding-bottom": interfaceHeight, "padding-right": interfaceWidth}).hide(); // Setup button & key events. - $next.click(next); - $prev.click(prev); - $close.click(close); + $next.click(cboxPublic.next); + $prev.click(cboxPublic.prev); + $close.click(cboxPublic.close); // Adding the 'hover' class allowed the browser to load the hover-state // background graphics. The class can now can be removed. $content.children().removeClass(hover); }; - position = function (mWidth, mHeight, speed, loadedCallback) { + cboxPublic.position = function (mWidth, mHeight, speed, loadedCallback) { var winHeight = document.documentElement.clientHeight, posTop = winHeight / 2 - mHeight / 2, posLeft = document.documentElement.clientWidth / 2 - mWidth / 2, @@ -292,46 +338,58 @@ }); }; - dimensions = function (object) { + cboxPublic.resize = function (object) { if(!open){ return; } - $window.unbind('resize.cbox_resize'); - - var width, height, topMargin, prev, prevSrc, next, nextSrc, photo, + var width, + height, + topMargin, + prev, + prevSrc, + next, + nextSrc, + photo, + timeout, speed = settings.transition==="none" ? 0 : settings.speed; + $window.unbind(cbox_resize); + + if(!object){ + timeout = setTimeout(function(){ //timer allows IE to render the dimensions before attempting to calculate the height + height = $loaded.children().outerHeight(TRUE); + $loaded[0].style.height = height + 'px'; + cboxPublic.position($loaded.width()+loadedWidth+interfaceWidth, height+loadedHeight+interfaceHeight, speed); + }, 1); + return; + } + $loaded.remove(); $loaded = $(object); function getWidth(){ - if(settings.width){ - width = maxWidth; - } else { - width = maxWidth && maxWidth < $loaded.width() ? maxWidth : $loaded.width(); - } + width = settings.width ? maxWidth : maxWidth && maxWidth < $loaded.width() ? maxWidth : $loaded.width(); return width; } function getHeight(){ - if(settings.height){ - height = maxHeight; - } else { - height = maxHeight && maxHeight < $loaded.height() ? maxHeight : $loaded.height(); - } + height = settings.height ? maxHeight : maxHeight && maxHeight < $loaded.height() ? maxHeight : $loaded.height(); return height; } + if(!settings.scrollbars){ + $loaded.css({overflow:'hidden'}); + } + $loaded.hide().appendTo('body') .attr({id:'cboxLoadedContent'}) .css({width:getWidth()}) .css({height:getHeight()})//sets the height independently from the width in case the new width influences the value of height. .prependTo($content); - // Hides 'select' form elements in IE6 because they would otherwise sit on top of the overlay. - if ($.browser.msie && $.browser.version < 7) { + if (isIE6) { $('select:not(#colorbox select)').filter(function(){ return $(this).css('visibility') !== 'hidden'; - }).css({'visibility':'hidden'}).one(cbox_close, function(){ + }).css({'visibility':'hidden'}).one(cbox_cleanup, function(){ $(this).css({'visibility':'inherit'}); }); } @@ -346,14 +404,15 @@ var mWidth = width+loadedWidth+interfaceWidth, mHeight = height+loadedHeight+interfaceHeight; - position(mWidth, mHeight, s, function(){ + $().unbind('keydown', cbox_key); + cboxPublic.position(mWidth, mHeight, s, function(){ if (!open) { return; } - if ($.browser.msie) { + if (isIE) { //This fadeIn helps the bicubic resampling to kick-in. if( photo ){$loaded.fadeIn(100);} //IE adds a filter when ColorBox fades in and out that can cause problems if the loaded content contains transparent pngs. - $cbox.css('filter',''); + $cbox[0].style.removeAttribute("filter"); } $content.children().show(); @@ -371,7 +430,7 @@ $next.html(settings.next); $prev.html(settings.previous); - $().unbind('keydown', cbox_key).bind('keydown', cbox_key); + $().bind('keydown', cbox_key); if(settings.slideshow){ $slideshow.show(); @@ -392,21 +451,18 @@ if (settings.transition === 'fade'){ $cbox.fadeTo(speed, 1, function(){ - if($.browser.msie){$content.css('filter','');} + if(isIE){$cbox[0].style.removeAttribute("filter");} }); } - $window.bind('resize.cbox_resize', function(){ - position(mWidth, mHeight, 0); + $window.bind(cbox_resize, function(){ + cboxPublic.position(mWidth, mHeight, 0); }); }); } - if (settings.transition === 'fade') { - $cbox.fadeTo(speed, 0, function(){setPosition(0);}); - } else { - setPosition(speed); - } + if((settings.transition === 'fade' && $cbox.fadeTo(speed, 0, function(){setPosition(0);})) || setPosition(speed)){} + // Preloads images within a rel group if (settings.preloading && $related.length>1) { prev = index > 0 ? $related[index-1] : $related[$related.length-1]; @@ -417,27 +473,28 @@ if(isImage(nextSrc)){ $('<img />').attr('src', nextSrc); } + if(isImage(prevSrc)){ $('<img />').attr('src', prevSrc); } } }; - load = function () { - var height, width, href, loadingElement; - + cboxPublic.load = function () { + var height, width, href, loadingElement, resize = cboxPublic.resize; + element = $related[index]; settings = $(element).data(colorbox); //convert functions to static values process(); - + $.event.trigger(cbox_load); // Evaluate the height based on the optional height and width settings. - height = settings.height ? setSize(settings.height, 'y') - loadedHeight - interfaceHeight : false; - width = settings.width ? setSize(settings.width, 'x') - loadedWidth - interfaceWidth : false; + height = settings.height ? setSize(settings.height, 'y') - loadedHeight - interfaceHeight : FALSE; + width = settings.width ? setSize(settings.width, 'x') - loadedWidth - interfaceWidth : FALSE; href = settings.href || element.href; @@ -447,11 +504,11 @@ //Re-evaluate the maximum dimensions based on the optional maxheight and maxwidth. if(settings.maxHeight){ - maxHeight = settings.maxHeight ? setSize(settings.maxHeight, 'y') - loadedHeight - interfaceHeight : false; + maxHeight = settings.maxHeight ? setSize(settings.maxHeight, 'y') - loadedHeight - interfaceHeight : FALSE; height = height && height < maxHeight ? height : maxHeight; } if(settings.maxWidth){ - maxWidth = settings.maxWidth ? setSize(settings.maxWidth, 'x') - loadedWidth - interfaceWidth : false; + maxWidth = settings.maxWidth ? setSize(settings.maxWidth, 'x') - loadedWidth - interfaceWidth : FALSE; width = width && width < maxWidth ? width : maxWidth; } @@ -459,25 +516,21 @@ maxWidth = width; if (settings.inline) { - $('<div id="cboxInlineTemp" />').hide().insertBefore($(href)[0]).bind(cbox_load+' '+cbox_close, function(){ + $('<div id="cboxInlineTemp" />').hide().insertBefore($(href)[0]).bind(cbox_load+' '+cbox_cleanup, function(){ $loaded.children().insertBefore(this); $(this).remove(); }); - dimensions($(href).wrapAll('<div/>').parent()); + resize($(href).wrapAll('<div/>').parent()); } else if (settings.iframe) { - dimensions( - $("<div><div id='cboxIframeTemp' /></div>") - );//timestamp to prevent caching. + resize($("<div><div id='cboxIframeTemp' /></div>")); } else if (settings.html) { - dimensions( - $('<div/>').html(settings.html) - ); + resize($('<div/>').html(settings.html)); } else if (isImage(href)){ loadingElement = new Image(); loadingElement.onload = function(){ loadingElement.onload = null; - if((maxHeight || maxWidth) && settings.resize){ + if((maxHeight || maxWidth) && settings.scalePhotos){ var width = this.width, height = this.height, percent = 0, @@ -498,11 +551,14 @@ setResize(); } } - dimensions($("<div />").css({width:this.width, height:this.height}).append($(this).css({width:this.width, height:this.height, display:"block", margin:"auto", border:0}).attr('id', 'cboxPhoto'))); + + resize($("<div />").css({width:this.width, height:this.height}).append($(this).css({width:this.width, height:this.height, display:"block", margin:"auto", border:0}).attr('id', 'cboxPhoto'))); + if($related.length > 1){ - $(this).css({cursor:'pointer'}).click(next); + $(this).css({cursor:'pointer'}).click(cboxPublic.next); } - if($.browser.msie && $.browser.version == 7){ + + if(isIE){ this.style.msInterpolationMode='bicubic'; } }; @@ -510,38 +566,38 @@ } else { $('<div />').load(href, function(data, textStatus){ if(textStatus === "success"){ - dimensions($(this)); + resize($(this)); } else { - dimensions($("<p>Request unsuccessful.</p>")); + resize($("<p>Request unsuccessful.</p>")); } }); - } + } }; //navigates to the next page/image in a set. - next = function () { + cboxPublic.next = function () { index = index < $related.length-1 ? index+1 : 0; - load(); + cboxPublic.load(); }; - prev = function () { + cboxPublic.prev = function () { index = index > 0 ? index-1 : $related.length-1; - load(); + cboxPublic.load(); }; - slideshow = function () { + cboxPublic.slideshow = function () { var stop, timeOut, className = 'cboxSlideshow_'; - $slideshow.bind(cbox_close, function(){ + $slideshow.bind(cbox_cleanup, function(){ clearTimeout(timeOut); - $slideshow.unbind(); + $slideshow.unbind(cbox_complete+' '+cbox_load+" click"); }); function start(){ $slideshow .text(settings.slideshowStop) .bind(cbox_complete, function(){ - timeOut = setTimeout(next, settings.slideshowSpeed); + timeOut = setTimeout(cboxPublic.next, settings.slideshowSpeed); }) .bind(cbox_load, function(){ clearTimeout(timeOut); @@ -559,7 +615,7 @@ .unbind(cbox_complete+' '+cbox_load) .one("click", function(){ start(); - timeOut = setTimeout(next, settings.slideshowSpeed); + timeOut = setTimeout(cboxPublic.next, settings.slideshowSpeed); $(this).removeClass(hover); }); $cbox.removeClass(className+"on").addClass(className+"off"); @@ -574,42 +630,29 @@ } }; - //public function for closing colorbox. To use this within an iframe use the following format: parent.$.fn.colorbox.close(); - close = function () { - $.event.trigger(cbox_close); - open = false; + //Note: to use this within an iframe use the following format: parent.$.fn.colorbox.close(); + cboxPublic.close = function () { + $.event.trigger(cbox_cleanup); + open = FALSE; $().unbind('keydown', cbox_key).unbind("keydown.cbox_close"); - $window.unbind('resize.cbox_resize resize.cboxie6 scroll.cboxie6'); - $overlay.css({cursor:'auto'}).fadeOut('fast'); + $window.unbind(cbox_resize+" "+cbox_ie6); + $overlay.css({cursor: 'auto'}).fadeOut('fast'); - $content.children().hide(); - $cbox - .stop(true, false) - .removeClass() - .fadeOut('fast', function(){ + .stop(TRUE, FALSE) + .fadeOut('fast', function () { $loaded.remove(); - $cbox.css({'opacity':1}); + $cbox.css({'opacity': 1}); + $content.children().hide(); $.event.trigger(cbox_closed); }); - }; - // Create Public Methods - publicMethod = $.fn.colorbox; - publicMethod.init = init; - publicMethod.next = next; - publicMethod.prev = prev; - publicMethod.close = close; - publicMethod.load = load; - publicMethod.position = position; - publicMethod.dimensions = dimensions; - publicMethod.element = function(){ return element; }; - publicMethod.settings = defaults; + cboxPublic.element = function(){ return element; }; + cboxPublic.settings = defaults; + // Initializes ColorBox when the DOM has loaded - $(function () { - init(); - }); + $(cboxPublic.init); }(jQuery)); Deleted: third_party/jquery/colorbox/styles/colorbox-ie.css =================================================================== --- third_party/jquery/colorbox/styles/colorbox-ie.css 2009-10-16 17:01:16 UTC (rev 22386) +++ third_party/jquery/colorbox/styles/colorbox-ie.css 2009-10-16 17:03:12 UTC (rev 22387) @@ -1,15 +0,0 @@ -/* - The following fixes png-transparency for IE6. - It is also necessary for png-transparency to cooperate with the fade transition in IE7 & IE8 - - Since this method does not support CSS background-positioning, it is incompatible with CSS sprites. - Colorbox preloads navigation hover classes to account for this. -*/ -#cboxTopLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderTopLeft.png, sizingMethod='scale');} -#cboxTopCenter{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderTopCenter.png, sizingMethod='scale');} -#cboxTopRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderTopRight.png, sizingMethod='scale');} -#cboxBottomLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderBottomLeft.png, sizingMethod='scale');} -#cboxBottomCenter{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderBottomCenter.png, sizingMethod='scale');} -#cboxBottomRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderBottomRight.png, sizingMethod='scale');} -#cboxMiddleLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderMiddleLeft.png, sizingMethod='scale');} -#cboxMiddleRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderMiddleRight.png, sizingMethod='scale');} Modified: third_party/jquery/colorbox/styles/colorbox.css =================================================================== --- third_party/jquery/colorbox/styles/colorbox.css 2009-10-16 17:01:16 UTC (rev 22386) +++ third_party/jquery/colorbox/styles/colorbox.css 2009-10-16 17:03:12 UTC (rev 22387) @@ -1,11 +1,12 @@ /* ColorBox Core Style - The following rules are the styles that are consistant between all ColorBox themes + The following rules are the styles that are consistant between themes. + Avoid changing this area to maintain compatability with future versions of ColorBox. */ #colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;} #cboxOverlay{position:fixed; width:100%; height:100%;} #cboxMiddleLeft, #cboxBottomLeft{clear:left;} -#cboxContent{position:relative; overflow:visible;} +#cboxContent{position:relative; overflow:hidden;} #cboxLoadedContent{overflow:auto;} #cboxLoadedContent iframe{display:block; width:100%; height:100%; border:0;} #cboxTitle{margin:0;} @@ -13,33 +14,49 @@ #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} /* - ColorBox example user style - The following rules are ordered and tabbed in a way that represents the order/nesting of the generated HTML, - in hope that this will make the relationship easier to understand. Thanks, ja...@co... + Example user style + The following rules are ordered and tabbed in a way that represents the + order/nesting of the generated HTML, so that the structure easier to understand. */ #cboxOverlay{background:url(images/overlay.png) 0 0 repeat;} - #colorbox{} - #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) -100px 0 no-repeat;} - #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) -129px 0 no-repeat;} - #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) -100px -29px no-repeat;} - #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) -129px -29px no-repeat;} - #cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;} - #cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;} + #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) -100px 0 no-repeat;} + #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) -129px 0 no-repeat;} + #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) -100px -29px no-repeat;} + #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) -129px -29px no-repeat;} + #cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;} + #cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;} + #cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;} + #cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;} + #cboxContent{background:#fff;} + #cboxLoadedContent{margin-bottom:28px;} + #cboxTitle{position:absolute; bottom:3px; left:0; text-align:center; width:100%; color:#949494;} + #cboxCurrent{position:absolute; bottom:3px; left:58px; color:#949494;} + #cboxSlideshow{position:absolute; bottom:3px; right:30px; color:#0092ef;} + #cboxPrevious{position:absolute; bottom:0; left:0px; background:url(images/controls.png) -75px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} + #cboxPrevious.hover{background-position:-75px -25px;} + #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) -50px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} + #cboxNext.hover{background-position:-50px -25px;} + #cboxLoadingOverlay{background:url(images/loading_background.png) center center no-repeat;} + #cboxLoadingGraphic{background:url(images/loading.gif) center center no-repeat;} + #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) -25px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} + #cboxClose.hover{background-position:-25px -25px;} - #cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;} - #cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;} - - #cboxContent{background:#fff;} - #cboxLoadedContent{margin-bottom:28px;} - #cboxTitle{position:absolute; bottom:3px; left:0; text-align:center; width:100%; color:#949494;} - #cboxCurrent{position:absolute; bottom:3px; left:58px; color:#949494;} - #cboxSlideshow{position:absolute; bottom:3px; right:30px; color:#0092ef;} - #cboxPrevious{position:absolute; bottom:0; left:0px; background:url(images/controls.png) -75px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} - #cboxPrevious.hover{background-position:-75px -25px;} - #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) -50px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} - #cboxNext.hover{background-position:-50px -25px;} - #cboxLoadingOverlay{background:url(images/loading_background.png) center center no-repeat;} - #cboxLoadingGraphic{background:url(images/loading.gif) center center no-repeat;} - #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) -25px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} - #cboxClose.hover{background-position:-25px -25px;} \ No newline at end of file +/* + The following fixes png-transparency for IE6. + It is also necessary for png-transparency in IE7 & IE8 to avoid 'black halos' with the fade transition + + Since this method does not support CSS background-positioning, it is incompatible with CSS sprites. + Colorbox preloads navigation hover classes to account for this. + + !! Important Note: AlphaImageLoader src paths are relative to the HTML document, + while regular CSS background images are relative to the CSS document. +*/ +.cboxIE #cboxTopLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderTopLeft.png, sizingMethod='scale');} +.cboxIE #cboxTopCenter{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderTopCenter.png, sizingMethod='scale');} +.cboxIE #cboxTopRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderTopRight.png, sizingMethod='scale');} +.cboxIE #cboxBottomLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderBottomLeft.png, sizingMethod='scale');} +.cboxIE #cboxBottomCenter{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderBottomCenter.png, sizingMethod='scale');} +.cboxIE #cboxBottomRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderBottomRight.png, sizingMethod='scale');} +.cboxIE #cboxMiddleLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderMiddleLeft.png, sizingMethod='scale');} +.cboxIE #cboxMiddleRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderMiddleRight.png, sizingMethod='scale');} Modified: third_party/jquery/jquery-tiki-readme.txt =================================================================== --- third_party/jquery/jquery-tiki-readme.txt 2009-10-16 17:01:16 UTC (rev 22386) +++ third_party/jquery/jquery-tiki-readme.txt 2009-10-16 17:03:12 UTC (rev 22387) @@ -5,6 +5,9 @@ - - - - - - - - - - - - - jonnybradley October 2009 +Updates: + colorbox-1.3.1 + Added: jquery.async v1.0.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |