October 2012 - Movecommons-commits - lists.ourproject.org

r537 - in trunk: src/images wp-theme
by Mario Gallegos 31 Oct '12

31 Oct '12

Author: mgallegos Date: 2012-11-01 00:51:46 +0100 (Thu, 01 Nov 2012) New Revision: 537 Added: trunk/src/images/progressTransparentLine.png Modified: trunk/wp-theme/mc2-form.php Log: Added: trunk/src/images/progressTransparentLine.png =================================================================== (Binary files differ) Property changes on: trunk/src/images/progressTransparentLine.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-10-31 23:39:15 UTC (rev 536) +++ trunk/wp-theme/mc2-form.php 2012-10-31 23:51:46 UTC (rev 537) @@ -33,10 +33,8 @@ <div id="containerSlides"> <div id="first_step" class="mc-form-category-group-a-v2">  - <div class="progressLine"> -  + <div class="progressLine"> + <img src="/mc/0.1/images/progressTransparentLine.png" style="float: left;"> <div class="complete" style="width: 19px;margin-top: 0"> <div class="marker"></div> </div>

1 0

r536 - in trunk: src wp-theme
by Mario Gallegos 31 Oct '12

31 Oct '12

Author: mgallegos Date: 2012-11-01 00:39:15 +0100 (Thu, 01 Nov 2012) New Revision: 536 Modified: trunk/src/mc-dia-form2.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc-dia-form2.css =================================================================== --- trunk/src/mc-dia-form2.css 2012-10-31 23:34:25 UTC (rev 535) +++ trunk/src/mc-dia-form2.css 2012-10-31 23:39:15 UTC (rev 536) @@ -135,7 +135,7 @@ #progress_bar { - /*background: url('/mc/0.1/images/progress_bar.png') no-repeat;*/ + background: url('/mc/0.1/images/progress_bar.png') no-repeat; width: 339px; height: 24px; margin: 20px auto; Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-10-31 23:34:25 UTC (rev 535) +++ trunk/wp-theme/mc2-form.php 2012-10-31 23:39:15 UTC (rev 536) @@ -34,7 +34,9 @@ <div id="containerSlides"> <div id="first_step" class="mc-form-category-group-a-v2">  <div class="progressLine"> +  <div class="complete" style="width: 19px;margin-top: 0"> <div class="marker"></div> </div>

1 0

r535 - in trunk: src wp-theme
by Mario Gallegos 31 Oct '12

31 Oct '12

Author: mgallegos Date: 2012-11-01 00:34:25 +0100 (Thu, 01 Nov 2012) New Revision: 535 Modified: trunk/src/mc-dia-form2.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc-dia-form2.css =================================================================== --- trunk/src/mc-dia-form2.css 2012-10-31 23:27:03 UTC (rev 534) +++ trunk/src/mc-dia-form2.css 2012-10-31 23:34:25 UTC (rev 535) @@ -135,7 +135,7 @@ #progress_bar { - background: url('/mc/0.1/images/progress_bar.png') no-repeat; + /*background: url('/mc/0.1/images/progress_bar.png') no-repeat;*/ width: 339px; height: 24px; margin: 20px auto; Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-10-31 23:27:03 UTC (rev 534) +++ trunk/wp-theme/mc2-form.php 2012-10-31 23:34:25 UTC (rev 535) @@ -34,7 +34,7 @@ <div id="containerSlides"> <div id="first_step" class="mc-form-category-group-a-v2">  <div class="progressLine"> - <a href="#" class="step2-image-click"></a> + <img src="/mc/0.1/images/progress_bar.png"> <div class="complete" style="width: 19px;margin-top: 0"> <div class="marker"></div> </div>

1 0

r534 - trunk/wp-theme
by Mario Gallegos 31 Oct '12

31 Oct '12

Author: mgallegos Date: 2012-11-01 00:27:03 +0100 (Thu, 01 Nov 2012) New Revision: 534 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-10-31 22:53:13 UTC (rev 533) +++ trunk/wp-theme/mc2-form.php 2012-10-31 23:27:03 UTC (rev 534) @@ -417,19 +417,7 @@ <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/ui-darkness/jqu…"/> <link rel="stylesheet" type="text/css" href="/mc/0.1/mc-dia-form2.css"/> -<style type="text/css" media="screen"> - .step2-image-click { - position: absolute; - top: 8px; - left: 20px; - width: 83px; - height: 83px; - background-color: transparent; - border: 1px solid yellow; - } -</style> - <script type="text/javascript"> $j(document).ready(function() { $j('#languages').tagsInput({defaultText:'Add a language'});

1 0

r533 - in trunk: src wp-theme
by Mario Gallegos 31 Oct '12

31 Oct '12

Author: mgallegos Date: 2012-10-31 23:53:13 +0100 (Wed, 31 Oct 2012) New Revision: 533 Modified: trunk/src/mc-dia-form2.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc-dia-form2.css =================================================================== --- trunk/src/mc-dia-form2.css 2012-10-31 22:45:01 UTC (rev 532) +++ trunk/src/mc-dia-form2.css 2012-10-31 22:53:13 UTC (rev 533) @@ -139,7 +139,7 @@ width: 339px; height: 24px; margin: 20px auto; - position: relative; + position: relative; } #progress { Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-10-31 22:45:01 UTC (rev 532) +++ trunk/wp-theme/mc2-form.php 2012-10-31 22:53:13 UTC (rev 533) @@ -34,6 +34,7 @@ <div id="containerSlides"> <div id="first_step" class="mc-form-category-group-a-v2">  <div class="progressLine"> + <a href="#" class="step2-image-click"></a> <div class="complete" style="width: 19px;margin-top: 0"> <div class="marker"></div> </div> @@ -65,8 +66,7 @@ <div class="mc-cat-group-v2" id="mc-cat-group-a"> <div style="float: left;" class="mc-form-category-group-a-v2"> <div class="progressLine"> - <div class="complete" style="width: 111px;"> - <a href="#" class="step2-image-click"></a> + <div class="complete" style="width: 111px;"> <div class="marker" style="background-position: -26px 0;"></div> </div> </div>

1 0

r532 - in trunk: src wp-theme
by Mario Gallegos 31 Oct '12

31 Oct '12

Author: mgallegos Date: 2012-10-31 23:45:01 +0100 (Wed, 31 Oct 2012) New Revision: 532 Modified: trunk/src/mc-dia-form2.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc-dia-form2.css =================================================================== --- trunk/src/mc-dia-form2.css 2012-10-31 17:51:07 UTC (rev 531) +++ trunk/src/mc-dia-form2.css 2012-10-31 22:45:01 UTC (rev 532) @@ -139,7 +139,7 @@ width: 339px; height: 24px; margin: 20px auto; - position: relative; + position: relative; } #progress { Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-10-31 17:51:07 UTC (rev 531) +++ trunk/wp-theme/mc2-form.php 2012-10-31 22:45:01 UTC (rev 532) @@ -66,6 +66,7 @@ <div style="float: left;" class="mc-form-category-group-a-v2"> <div class="progressLine"> <div class="complete" style="width: 111px;"> + <a href="#" class="step2-image-click"></a> <div class="marker" style="background-position: -26px 0;"></div> </div> </div> @@ -416,7 +417,19 @@ <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/ui-darkness/jqu…"/> <link rel="stylesheet" type="text/css" href="/mc/0.1/mc-dia-form2.css"/> +<style type="text/css" media="screen"> + .step2-image-click { + position: absolute; + top: 8px; + left: 20px; + width: 83px; + height: 83px; + background-color: transparent; + border: 1px solid yellow; + } +</style> + <script type="text/javascript"> $j(document).ready(function() { $j('#languages').tagsInput({defaultText:'Add a language'});

1 0

r531 - trunk/src
by Mario Gallegos 31 Oct '12

31 Oct '12

Author: mgallegos Date: 2012-10-31 18:51:07 +0100 (Wed, 31 Oct 2012) New Revision: 531 Added: trunk/src/jquery.imagemapster.min.js Log: Added: trunk/src/jquery.imagemapster.min.js =================================================================== --- trunk/src/jquery.imagemapster.min.js (rev 0) +++ trunk/src/jquery.imagemapster.min.js 2012-10-31 17:51:07 UTC (rev 531) @@ -0,0 +1,365 @@ +/* ImageMapster + Version: see $.mapster.version + +Copyright 2011-2012 James Treworgy +http://www.outsharked.com/imagemapster +https://github.com/jamietre/ImageMapster + +A jQuery plugin to enhance image maps. + +Versions 1.2.4.067+ include "when.js": http://github.com/cujos/when in the +distribution build. + +*/ +(function(a){a(function(){var i,p,u,w;x.defer=h;x.reject=r;x.isPromise=j;x.all=d; +x.some=v;x.any=e;x.map=k;x.reduce=o;x.chain=f;i=Object.freeze||function(y){return y; +};function n(){}n.prototype=i({always:function(y,z){return this.then(y,y,z);},otherwise:function(y){return this.then(w,y); +}});function t(z){var y=new n();y.then=function(A){var C;try{if(A){C=A(z);}return m(C===w?z:C); +}catch(B){return s(B);}};return i(y);}function s(z){var y=new n();y.then=function(A,C){var D; +try{if(C){D=C(z);return m(D===w?z:D);}return s(z);}catch(B){return s(B);}};return i(y); +}function r(y){return x(y,function(z){return s(z);});}function h(){var B,F,C,E,z,y,A; +C=[];E=[];z=function J(K,M,N){var L=h();C.push(function(O){O.then(K,M).then(L.resolve,L.reject,L.progress); +});N&&E.push(N);return L.promise;};function I(K,L,M){return z(K,L,M);}function H(K){A(t(K)); +}function G(K){A(s(K));}y=function(M){var L,K=0;while(L=E[K++]){L(M);}};function D(K){y(K); +}A=function(L){var N,M=0;z=L.then;A=y=function K(){throw new Error("already completed"); +};E=w;while(N=C[M++]){N(L);}C=[];};B={};F=new n();F.then=B.then=I;B.promise=i(F); +B.resolver=i({resolve:(B.resolve=H),reject:(B.reject=G),progress:(B.progress=D)}); +return B;}function j(y){return y&&typeof y.then==="function";}function x(B,y,z,A){var C=m(B); +return C.then(y,z,A);}function m(A){var z,y;if(A instanceof n){z=A;}else{y=h();if(j(A)){A.then(y.resolve,y.reject,y.progress); +z=y.promise;}else{y.resolve(A);z=y.promise;}}return z;}function v(C,A,y,z,B){g(2,arguments); +return x(C,function(J){var Q,O,P,E,N,L,F,H,G;H=J.length>>>0;Q=Math.max(0,Math.min(A,H)); +O=[];E=h();P=x(E,y,z,B);function M(R){N(R);}function K(R){L(R);}function I(R){F(R); +}function D(){N=L=F=l;}if(!Q){E.resolve(O);}else{N=function(R){O.push(R);if(!--Q){D(); +E.resolve(O);}};L=function(R){D();E.reject(R);};F=E.progress;for(G=0;G<H;++G){if(G in J){x(J[G],M,K,I); +}}}return P;});}function d(B,y,z,A){g(1,arguments);return x(B,function(C){return c(C,q,[]); +}).then(y,z,A);}function q(y,A,z){y[z]=A;return y;}function e(B,y,z,A){function C(D){return y?y(D[0]):D[0]; +}return v(B,1,C,z,A);}function k(z,y){return x(z,function(A){return b(A,y);});}function b(B,A){var C,z,y; +z=B.length>>>0;C=new Array(z);for(y=0;y<z;y++){if(y in B){C[y]=x(B[y],A);}}return c(C,q,C); +}function o(A,B,z){var y=u.call(arguments,1);return x(A,function(C){return c.apply(w,[C].concat(y)); +});}function c(A,B,z){var C,y;C=A.length;y=[function(D,F,E){return x(D,function(G){return x(F,function(H){return B(G,H,E,C); +});});}];if(arguments.length>2){y.push(z);}return p.apply(A,y);}function f(y,z,A){var B=arguments.length>2; +return x(y,function(C){if(B){C=A;}z.resolve(C);return C;},function(C){z.reject(C); +return s(C);},z.progress);}function g(B,z){var y,A=z.length;while(A>B){y=z[--A];if(y!=null&&typeof y!="function"){throw new Error("callback is not a function"); +}}}function l(){}u=[].slice;p=[].reduce||function(D){var z,y,C,B,A;A=0;z=Object(this); +B=z.length>>>0;y=arguments;if(y.length<=1){for(;;){if(A in z){C=z[A++];break;}if(++A>=B){throw new TypeError(); +}}}else{C=y[1];}for(;A<B;++A){if(A in z){C=D(C,z[A],A,z);}}return C;};return x;}); +})(typeof define=="function"?define:function(a){typeof module!="undefined"?(module.exports=a()):(jQuery.mapster_when=a()); +});(function(a){a.fn.mapster=function(d){var c=a.mapster.impl;if(a.isFunction(c[d])){return c[d].apply(this,Array.prototype.slice.call(arguments,1)); +}else{if(typeof d==="object"||!d){return c.bind.apply(this,arguments);}else{a.error("Method "+d+" does not exist on jQuery.mapster"); +}}};a.mapster={version:"1.2.6",render_defaults:{isSelectable:true,isDeselectable:true,fade:false,fadeDuration:150,altImage:null,fill:true,fillColor:"000000",fillColorMask:"FFFFFF",fillOpacity:0.7,highlight:null,stroke:false,strokeColor:"ff0000",strokeOpacity:1,strokeWidth:1,includeKeys:"",alt_image:null},defaults:{clickNavigate:false,wrapClass:null,wrapCss:null,onGetList:null,sortList:false,listenToList:false,mapKey:"",mapValue:"",singleSelect:false,listKey:"value",listSelectedAttribute:"selected",listSelectedClass:null,onClick:null,onMouseover:null,onMouseout:null,mouseoutDelay:0,onStateChange:null,boundList:null,onConfigured:null,configTimeout:30000,noHrefIsMask:true,scaleMap:true,safeLoad:false,areas:[]},shared_defaults:{render_highlight:{fade:true},render_select:{fade:false},staticState:null,selected:null},area_defaults:{includeKeys:"",isMask:false},canvas_style:{position:"absolute",left:0,top:0,padding:0,border:0},hasCanvas:null,isTouch:null,windowLoaded:false,map_cache:[],hooks:{},addHook:function(d,c){this.hooks[d]=(this.hooks[d]||[]).push(c); +},callHooks:function(d,c){a.each(this.hooks[d]||[],function(g,f){f.apply(c);});},utils:{subclass:function(c,d){var e=function(){var g=this,f=Array.prototype.slice.call(arguments,0); +g.base=c.prototype;g.base.init=function(){c.prototype.constructor.apply(g,f);};d.apply(g,f); +};e.prototype=new c();e.prototype.constructor=e;return e;},asArray:function(c){return c.constructor===Array?c:this.split(c); +},split:function(g,d){var f,e,c=g.split(",");for(f=0;f<c.length;f++){e=a.trim(c[f]); +if(e===""){c.splice(f,1);}else{c[f]=d?d(e):e;}}return c;},updateProps:function(c,d){var e,f=c||{},g=a.isEmptyObject(f)?d:c; +e=[];a.each(g,function(h){e.push(h);});a.each(Array.prototype.slice.call(arguments,1),function(h,j){a.each(j||{},function(k){if(!e||a.inArray(k,e)>=0){var i=j[k]; +if(a.isPlainObject(i)){f[k]=a.extend(f[k]||{},i);}else{if(i&&i.constructor===Array){f[k]=i.slice(0); +}else{if(typeof i!=="undefined"){f[k]=j[k];}}}}});});return f;},isElement:function(c){return(typeof HTMLElement==="object"?c instanceof HTMLElement:c&&typeof c==="object"&&c.nodeType===1&&typeof c.nodeName==="string"); +},indexOfProp:function(c,d,f){var e=c.constructor===Array?-1:null;a.each(c,function(h,g){if(g&&(d?g[d]:g)===f){e=h; +return false;}});return e;},boolOrDefault:function(d,c){return this.isBool(d)?d:c||false; +},isBool:function(c){return typeof c==="boolean";},ifFunction:function(d,e,c){if(a.isFunction(d)){d.call(e,c); +}},size:function(c){var d=a.mapster.utils;return{width:d.imgWidth(c,true),height:d.imgHeight(c,true),complete:function(){return !!this.height&&!!this.width; +}};},setOpacity:function(c,d){c.style.opacity=d;},fader:(function(){var c={},e=0,d=function(g,k,h,f){var i,j,l=a.mapster.utils; +if(typeof g==="number"){j=c[g];if(!j){return;}}else{i=l.indexOfProp(c,null,g);if(i){delete c[i]; +}c[++e]=j=g;g=e;}h=h||1;k=(k+(h/10)>h-0.01)?h:k+(h/10);l.setOpacity(j,k);if(k<h){setTimeout(function(){d(g,k,h,f); +},f?f/10:15);}};return d;}())},getBoundList:function(g,e){if(!g.boundList){return null; +}var c,d,h=a(),f=a.mapster.utils.split(e);g.boundList.each(function(k,j){for(c=0; +c<f.length;c++){d=f[c];if(a(j).is("["+g.listKey+'="'+d+'"]')){h=h.add(j);}}});return h; +},setBoundListProperties:function(c,e,d){e.each(function(g,f){if(c.listSelectedClass){if(d){a(f).addClass(c.listSelectedClass); +}else{a(f).removeClass(c.listSelectedClass);}}if(c.listSelectedAttribute){a(f).attr(c.listSelectedAttribute,d); +}});},getMapDataIndex:function(e){var d,c;switch(e.tagName&&e.tagName.toLowerCase()){case"area":c=a(e).parent().attr("name"); +d=a("img[usemap='#"+c+"']")[0];break;case"img":d=e;break;}return d?this.utils.indexOfProp(this.map_cache,"image",d):-1; +},getMapData:function(d){var c=this.getMapDataIndex(d.length?d[0]:d);if(c>=0){return c>=0?this.map_cache[c]:null; +}},queueCommand:function(e,f,d,c){if(!e){return false;}if(!e.complete||e.currentAction){e.commands.push({that:f,command:d,args:c}); +return true;}return false;},unload:function(){this.impl.unload();this.utils=null; +this.impl=null;a.fn.mapster=null;a.mapster=null;a("*").unbind();}};var b=a.mapster; +a.each(["width","height"],function(f,d){var c=d.substr(0,1).toUpperCase()+d.substr(1); +b.utils["img"+c]=function(e,g){return(g?a(e)[d]():0)||e[d]||e["natural"+c]||e["client"+c]||e["offset"+c]; +};});b.Method=function(g,d,c,f){var e=this;e.name=f.name;e.output=g;e.input=g;e.first=f.first||false; +e.args=f.args?Array.prototype.slice.call(f.args,0):[];e.key=f.key;e.func_map=d;e.func_area=c; +e.name=f.name;e.allowAsync=f.allowAsync||false;};b.Method.prototype.go=function(){var f,e,c,g,j,k=this.input,d=[],h=this; +g=k.length;for(f=0;f<g;f++){e=a.mapster.getMapData(k[f]);if(e){if(!h.allowAsync&&b.queueCommand(e,h.input,h.name,h.args)){if(this.first){j=""; +}continue;}c=e.getData(k[f].nodeName==="AREA"?k[f]:this.key);if(c){if(a.inArray(c,d)<0){d.push(c); +}}else{j=this.func_map.apply(e,h.args);}if(this.first||typeof j!=="undefined"){break; +}}}a(d).each(function(m,l){j=h.func_area.apply(l,h.args);});if(typeof j!=="undefined"){return j; +}else{return this.output;}};a.mapster.impl=(function(){var e={},d=a.mapster,i=a.mapster.utils,h,c; +c=function(j){return d.map_cache.push(j)-1;};h=function(k){d.map_cache.splice(k.index,1); +for(var j=d.map_cache.length-1;j>=this.index;j--){d.map_cache[j].index--;}};function f(n,k){var j,l,m=n.options.areas; +if(k){a.each(k,function(p,o){if(this){l=i.indexOfProp(m,"key",this.key);if(l>=0){a.extend(m[l],this); +}else{m.push(this);}j=n.getDataForKey(this.key);if(j){a.extend(j.options,this);}}}); +}}function g(j,k){var l=i.updateProps({},k);delete l.areas;i.updateProps(j.options,l); +f(j,k.areas);i.updateProps(j.area_options,j.options);}e.get=function(j){var k=d.getMapData(this); +if(!(k&&k.complete)){throw ("Can't access data until binding complete.");}return(new d.Method(this,function(){return this.getSelected(); +},function(){return this.isSelected();},{name:"get",args:arguments,key:j,first:true,allowAsync:true,defaultReturn:""})).go(); +};e.data=function(j){return(new d.Method(this,null,function(){return this;},{name:"data",args:arguments,key:j})).go(); +};e.highlight=function(j){return(new d.Method(this,function(){if(j===false){this.ensureNoHighlight(); +}else{var k=this.highlightId;return k>=0?this.data[k].key:null;}},function(){this.highlight(); +},{name:"highlight",args:arguments,key:j,first:true})).go();};e.keys=function(l,k){var m=[],n=d.getMapData(this); +if(!(n&&n.complete)){throw ("Can't access data until binding complete.");}function j(o){var p,q=[]; +if(!k){q.push(o.key);}else{p=o.areas();a.each(p,function(s,r){q=q.concat(r.keys); +});}a.each(q,function(s,r){if(a.inArray(r,m)<0){m.push(r);}});}if(!(n&&n.complete)){return""; +}if(typeof l==="string"){if(k){j(n.getDataForKey(l));}else{m=[n.getKeysForGroup(l)]; +}}else{k=l;this.each(function(p,o){if(o.nodeName==="AREA"){j(n.getDataForArea(o)); +}});}return m.join(",");};e.select=function(){e.set.call(this,true);};e.deselect=function(){e.set.call(this,false); +};e.set=function(s,m,q){var o,p,r=q,n,k;function t(u){if(u){switch(s){case true:u.addSelection(r); +break;case false:u.removeSelection(true);break;default:u.toggleSelection(r);break; +}}}function j(u){if(u&&a.inArray(u,k)<0){k.push(u);n+=(n===""?"":",")+u.key;}}function l(u){a.each(k,function(w,v){t(v); +});if(!s){u.removeSelectionFinish();}if(u.options.boundList){d.setBoundListProperties(u.options,d.getBoundList(u.options,n),s); +}}this.filter("img,area").each(function(v,u){var w;p=d.getMapData(u);if(p!==o){if(o){l(o); +}k=[];n="";}if(p){w="";if(u.nodeName.toUpperCase()==="IMG"){if(!d.queueCommand(p,a(u),"set",[s,m,r])){if(m instanceof Array){if(m.length){w=m.join(","); +}}else{w=m;}if(w){a.each(i.split(w),function(x,y){j(p.getDataForKey(y.toString())); +o=p;});}}}else{r=m;if(!d.queueCommand(p,a(u),"set",[s,r])){j(p.getDataForArea(u)); +o=p;}}}});if(p){l(p);}return this;};e.unbind=function(j){return(new d.Method(this,function(){this.clearEvents(); +this.clearMapData(j);h(this);},null,{name:"unbind",args:arguments})).go();};e.rebind=function(j){return(new d.Method(this,function(){var k=this; +k.complete=false;k.configureOptions(j);k.bindImages(true,function(){k.buildDataset(true); +k.complete=true;});},null,{name:"rebind",args:arguments})).go();};e.get_options=function(l,k){var j=i.isBool(l)?l:k; +return(new d.Method(this,function(){var m=a.extend({},this.options);if(j){m.render_select=i.updateProps({},d.render_defaults,m,m.render_select); +m.render_highlight=i.updateProps({},d.render_defaults,m,m.render_highlight);}return m; +},function(){return j?this.effectiveOptions():this.options;},{name:"get_options",args:arguments,first:true,allowAsync:true,key:l})).go(); +};e.set_options=function(j){return(new d.Method(this,function(){g(this,j);},null,{name:"set_options",args:arguments})).go(); +};e.unload=function(){var j;for(j=d.map_cache.length-1;j>=0;j--){if(d.map_cache[j]){e.unbind.call(a(d.map_cache[j].image)); +}}e.graphics=null;};e.snapshot=function(){return(new d.Method(this,function(){a.each(this.data,function(k,j){j.selected=false; +});this.base_canvas=this.graphics.createVisibleCanvas(this);a(this.image).before(this.base_canvas); +},null,{name:"snapshot"})).go();};e.state=function(){var j,k=null;a(this).each(function(m,l){if(l.nodeName==="IMG"){j=d.getMapData(l); +if(j){k=j.state();}return false;}});return k;};e.bind=function(j){return this.each(function(l,k){var m,n,p,o; +m=a(k);m.css("border",0);o=d.getMapData(k);if(o){e.unbind.apply(m);if(!o.complete){m.bind(); +return true;}o=null;}p=this.getAttribute("usemap");n=p&&a('map[name="'+p.substr(1)+'"]'); +if(!(m.is("img")&&p&&n.size()>0)){return true;}if(!o){o=new d.MapData(this,j);o.index=c(o); +o.map=n;o.bindImages(true);}});};e.init=function(l){var k,j;d.hasCanvas=(document.namespaces&&document.namespaces.g_vml_)?false:a("<canvas></canvas>")[0].getContext?true:false; +d.isTouch="ontouchstart" in document.documentElement;if(!(d.hasCanvas||document.namespaces)){a.fn.mapster=function(){return this; +};return;}if(!i.isBool(a.mapster.defaults.highlight)){d.render_defaults.highlight=!d.isTouch; +}a.extend(d.defaults,d.render_defaults,d.shared_defaults);a.extend(d.area_defaults,d.render_defaults,d.shared_defaults); +if(i.isBool(l)){d.hasCanvas=l;}if(a.browser.msie&&!d.hasCanvas&&!document.namespaces.v){document.namespaces.add("v","urn:schemas-microsoft-com:vml"); +k=document.createStyleSheet();j=["shape","rect","oval","circ","fill","stroke","imagedata","group","textbox"]; +a.each(j,function(n,m){k.addRule("v\\:"+m,"behavior: url(#default#VML); antialias:true"); +});}a(window).bind("load",function(){d.windowLoaded=true;a(d.map_cache).each(function(n,m){if(!m.complete&&m.isReadyToBind()){m.initialize(); +}});});};e.test=function(j){return eval(j);};return e;}());a.mapster.impl.init(); +}(jQuery));(function(a){var d,c=a.mapster,e=c.utils;function b(g,f,k){var j=g,i=j.map_data,h=k.isMask; +a.each(f.areas(),function(m,l){k.isMask=h||(l.nohref&&i.options.noHrefIsMask);j.addShape(l,k); +});k.isMask=h;}c.Graphics=function(f){var g=this;g.active=false;g.canvas=null;g.width=0; +g.height=0;g.shapes=[];g.masks=[];g.map_data=f;};d=c.Graphics.prototype={constructor:c.Graphics,begin:function(g,h){var f=a(g); +this.elementName=h;this.canvas=g;this.width=f.width();this.height=f.height();this.shapes=[]; +this.masks=[];this.active=true;},addShape:function(g,h){var f=h.isMask?this.masks:this.shapes; +f.push({mapArea:g,options:h});},createVisibleCanvas:function(f){return a(this.createCanvasFor(f)).addClass("mapster_el").css(c.canvas_style)[0]; +},addShapeGroup:function(f,k,m){var j=this,h,l,g,i=this.map_data,n=f.effectiveRenderOptions(k); +if(m){a.extend(n,m);}if(k==="select"){l="static_"+f.areaId.toString();g=i.base_canvas; +}else{g=i.overlay_canvas;}j.begin(g,l);if(n.includeKeys){h=e.split(n.includeKeys); +a.each(h,function(q,p){var o=i.getDataForKey(p.toString());b(j,o,o.effectiveRenderOptions(k)); +});}b(j,f,n);j.render();if(n.fade){e.fader(c.hasCanvas?g:a(g).find("._fill").not(".mapster_mask"),0,c.hasCanvas?1:n.fillOpacity,n.fadeDuration); +}}};if(c.hasCanvas){d.hex_to_decimal=function(f){return Math.max(0,Math.min(parseInt(f,16),255)); +};d.css3color=function(f,g){return"rgba("+this.hex_to_decimal(f.substr(0,2))+","+this.hex_to_decimal(f.substr(2,2))+","+this.hex_to_decimal(f.substr(4,2))+","+g+")"; +};d.renderShape=function(g,j,k){var h,f=j.coords(null,k);switch(j.shape){case"rect":g.rect(f[0],f[1],f[2]-f[0],f[3]-f[1]); +break;case"poly":g.moveTo(f[0],f[1]);for(h=2;h<j.length;h+=2){g.lineTo(f[h],f[h+1]); +}g.lineTo(f[0],f[1]);break;case"circ":case"circle":g.arc(f[0],f[1],f[2],0,Math.PI*2,false); +break;}};d.addAltImage=function(f,g,h,i){f.beginPath();this.renderShape(f,h);f.closePath(); +f.clip();f.globalAlpha=i.altImageOpacity||i.fillOpacity;f.drawImage(g,0,0,h.owner.scaleInfo.width,h.owner.scaleInfo.height); +};d.render=function(){var h,i,j=this,g=j.masks.length,k=j.createCanvasFor(j.map_data),l=k.getContext("2d"),f=j.canvas.getContext("2d"); +if(g){h=j.createCanvasFor(j.map_data);i=h.getContext("2d");i.clearRect(0,0,h.width,h.height); +a.each(j.masks,function(n,m){i.save();i.beginPath();j.renderShape(i,m.mapArea);i.closePath(); +i.clip();i.lineWidth=0;i.fillStyle="#000";i.fill();i.restore();});}a.each(j.shapes,function(m,n){l.save(); +if(n.options.fill){if(n.options.alt_image){j.addAltImage(l,n.options.alt_image,n.mapArea,n.options); +}else{l.beginPath();j.renderShape(l,n.mapArea);l.closePath();l.fillStyle=j.css3color(n.options.fillColor,n.options.fillOpacity); +l.fill();}}l.restore();});a.each(j.shapes.concat(j.masks),function(m,o){var n=o.options.strokeWidth===1?0.5:0; +if(o.options.stroke){l.save();l.strokeStyle=j.css3color(o.options.strokeColor,o.options.strokeOpacity); +l.lineWidth=o.options.strokeWidth;l.beginPath();j.renderShape(l,o.mapArea,n);l.closePath(); +l.stroke();l.restore();}});if(g){i.globalCompositeOperation="source-out";i.drawImage(k,0,0); +f.drawImage(h,0,0);}else{f.drawImage(k,0,0);}j.active=false;return j.canvas;};d.createCanvasFor=function(f){return a('<canvas width="'+f.scaleInfo.width+'" height="'+f.scaleInfo.height+'"></canvas>')[0]; +};d.clearHighlight=function(){var f=this.map_data.overlay_canvas;f.getContext("2d").clearRect(0,0,f.width,f.height); +};d.removeSelections=function(){};d.refreshSelections=function(){var f,g=this.map_data; +f=g.base_canvas;g.base_canvas=this.createVisibleCanvas(g);a(g.base_canvas).hide(); +a(f).before(g.base_canvas);g.redrawSelections();a(g.base_canvas).show();a(f).remove(); +};}else{e.setOpacity=function(f,g){a(f).each(function(j,h){if(typeof h.opacity!=="undefined"){h.opacity=g; +}else{a(h).css("opacity",g);}});};d.renderShape=function(l,n,g){var m=this,k,o,h,p,j,i,q,f=l.coords(); +j=m.elementName?'name="'+m.elementName+'" ':"";i=g?'class="'+g+'" ':"";p='<v:fill color="#'+n.fillColor+'" class="_fill" opacity="'+(n.fill?n.fillOpacity:0)+'" /><v:stroke class="_fill" opacity="'+n.strokeOpacity+'"/>'; +o=n.stroke?" strokeweight="+n.strokeWidth+' stroked="t" strokecolor="#'+n.strokeColor+'"':' stroked="f"'; +k=n.fill?' filled="t"':' filled="f"';switch(l.shape){case"rect":q="<v:rect "+i+j+k+o+' style="zoom:1;margin:0;padding:0;display:block;position:absolute;left:'+f[0]+"px;top:"+f[1]+"px;width:"+(f[2]-f[0])+"px;height:"+(f[3]-f[1])+'px;">'+p+"</v:rect>"; +break;case"poly":q="<v:shape "+i+j+k+o+' coordorigin="0,0" coordsize="'+m.width+","+m.height+'" path="m '+f[0]+","+f[1]+" l "+f.slice(2).join(",")+' x e" style="zoom:1;margin:0;padding:0;display:block;position:absolute;top:0px;left:0px;width:'+m.width+"px;height:"+m.height+'px;">'+p+"</v:shape>"; +break;case"circ":case"circle":q="<v:oval "+i+j+k+o+' style="zoom:1;margin:0;padding:0;display:block;position:absolute;left:'+(f[0]-f[2])+"px;top:"+(f[1]-f[2])+"px;width:"+(f[2]*2)+"px;height:"+(f[2]*2)+'px;">'+p+"</v:oval>"; +break;}h=a(q);a(m.canvas).append(h);return h;};d.render=function(){var g,f=this;a.each(this.shapes,function(j,h){f.renderShape(h.mapArea,h.options); +});if(this.masks.length){a.each(this.masks,function(j,h){g=e.updateProps({},h.options,{fillOpacity:1,fillColor:h.options.fillColorMask}); +f.renderShape(h.mapArea,g,"mapster_mask");});}this.active=false;return this.canvas; +};d.createCanvasFor=function(g){var i=g.scaleInfo.width,f=g.scaleInfo.height;return a('<var width="'+i+'" height="'+f+'" style="zoom:1;overflow:hidden;display:block;width:'+i+"px;height:"+f+'px;"></var>')[0]; +};d.clearHighlight=function(){a(this.map_data.overlay_canvas).children().remove(); +};d.removeSelections=function(f){if(f>=0){a(this.map_data.base_canvas).find('[name="static_'+f.toString()+'"]').remove(); +}else{a(this.map_data.base_canvas).children().remove();}};d.refreshSelections=function(){return null; +};}}(jQuery));(function(a){var c,b=a.mapster,d=b.utils;b.MapData=function(e,g){var f=this; +function h(l,i,j){function k(m){if(f.currentAreaId!==m&&f.highlightId>=0){j();}}if(f.activeAreaEvent){window.clearTimeout(f.activeAreaEvent); +f.activeAreaEvent=0;}if(l<0){return;}if(i.owner.currentAction||l){f.activeAreaEvent=window.setTimeout((function(){return function(){h(0,i,j); +};}(i)),l||100);}else{k(i.areaId);}}this.image=e;this.imgCssText=e.style.cssText||null; +this.initializeDefaults();this.configureOptions(g);this.mousedown=function(i){if(!a.mapster.hasCanvas){this.blur(); +}i.preventDefault();};this.mouseover=function(k){var j=f.getAllDataForArea(this),i=j.length?j[0]:null; +if(!i||i.isNotRendered()||i.owner.currentAction){return;}if(f.currentAreaId===i.areaId){return; +}if(f.highlightId!==i.areaId){f.clearEffects();i.highlight();if(f.options.showToolTip){a.each(j,function(m,l){if(l.effectiveOptions().toolTip){l.showTooltip(); +}});}}f.currentAreaId=i.areaId;if(a.isFunction(f.options.onMouseover)){f.options.onMouseover.call(this,{e:k,options:i.effectiveOptions(),key:i.key,selected:i.isSelected()}); +}};this.mouseout=function(j){var k,i=f.getDataForArea(this),l=f.options;if(f.currentAreaId<0||!i){return; +}k=f.getDataForArea(j.relatedTarget);if(k===i){return;}f.currentAreaId=-1;i.area=null; +h(l.mouseoutDelay,i,f.clearEffects);if(a.isFunction(l.onMouseout)){l.onMouseout.call(this,{e:j,options:l,key:i.key,selected:i.isSelected()}); +}};this.clearEffects=function(){var i=f.options;f.ensureNoHighlight();if(i.toolTipClose&&a.inArray("area-mouseout",i.toolTipClose)>=0&&f.activeToolTip){f.clearTooltip(); +}};this.click=function(m){var r,n,o,p,j,k,s,t=this,i=f.getDataForArea(this),q=f.options; +function l(u){var v;j=(u.isSelectable()&&(u.isDeselectable()||!u.isSelected()));if(j){p=!u.isSelected(); +}else{p=u.isSelected();}o=b.getBoundList(q,u.key);if(a.isFunction(q.onClick)){k=q.onClick.call(t,{e:m,listTarget:o,key:u.key,selected:p}); +if(d.isBool(k)){if(!k){return false;}s=a(u.area).attr("href");if(s!=="#"){window.location.href=s; +return false;}}}if(j){r=u.toggleSelection();}if(q.boundList&&q.boundList.length>0){b.setBoundListProperties(q,o,u.isSelected()); +}v=u.effectiveOptions();if(v.includeKeys){n=d.split(v.includeKeys);a.each(n,function(y,x){var w=f.getDataForKey(x.toString()); +if(!w.options.isMask){l(w);}});}}f.mousedown.call(this,m);if(q.clickNavigate&&i.href){window.location.href=i.href; +return;}if(i&&!i.owner.currentAction){q=f.options;l(i);}};this.graphics=new b.Graphics(this); +};c=b.MapData.prototype;c.configureOptions=function(e){this.area_options=d.updateProps({},b.area_defaults,e); +this.options=d.updateProps({},b.defaults,e);this.bindTries=this.options.configTimeout/200; +};c.initializeDefaults=function(){a.extend(this,{images:[],imageSources:[],imageStatus:[],altImagesXref:{},map:null,base_canvas:null,overlay_canvas:null,imagesLoaded:false,complete:false,commands:[],data:[],mapAreas:[],_xref:{},highlightId:-1,currentAreaId:-1,_tooltip_events:[],scaleInfo:null,index:-1,activeAreaEvent:null}); +};c.isActive=function(){return !this.complete||this.currentAction;};c.state=function(){return{complete:this.complete,resizing:this.currentAction==="resizing",zoomed:this.zoomed,zoomedArea:this.zoomedArea,scaleInfo:this.scaleInfo}; +};c.isReadyToBind=function(){return this.imagesLoaded&&(!this.options.safeLoad||b.windowLoaded); +};c.addImage=function(h,l,e){var g,k,j=this,f=function(n){return a.inArray(n,j.images); +},i=function(){var n=f(this);if(n>=0){j.imageStatus[n]=true;if(a.inArray(false,j.imageStatus)<0&&(!j.options.safeLoad||b.windowLoaded)){j.initialize(); +}}},m=function(n){var o=j.images.push(n)-1;j.imageSources[o]=k;j.imageStatus[o]=false; +if(e){j.altImagesXref[e]=o;}};if(!h&&!l){return;}g=h;k=l||a(g).attr("src");if(!k){throw ("Missing image source"); +}if(!g){g=a('<img class="mapster_el" />').hide()[0];a("body").append(g);m(g);a(g).bind("onload",i).bind("onerror",function(n){j.imageLoadError.call(j,n); +});a(g).attr("src",k);}else{m(g);}};c.isImageLoaded=function(f){var h,e,g=this;if(g.imageStatus[f]){return true; +}e=g.images[f];if(typeof e.complete!=="undefined"){h=e.complete;}else{h=!!d.imgWidth(e); +}g.imageStatus[f]=h;return h;};c.bindImages=function(f,e){var g,j=this,h=true,k=j.options,l=function(){j.bindImages.call(j,false,e); +};if(f){j.complete=false;j.triesLeft=j.bindTries;j.imagesLoaded=false;if(j.images.length>2){j.images=j.images.slice(0,2); +j.imageSources=j.imageSources.slice(0,2);j.imageStatus=j.imageStatus.slice(0,2);j.altImagesXref={}; +}j.altImagesXref={};if(j.images.length===0){j.addImage(j.image);j.addImage(null,j.image.src); +}if(a.mapster.hasCanvas){j.addImage(null,k.render_highlight.altImage||k.altImage,"highlight"); +j.addImage(null,k.render_select.altImage||k.altImage,"select");}}if(j.imagesLoaded){return; +}g=j.images.length;while(g-->0){if(!j.isImageLoaded(g)){h=false;break;}}j.imagesLoaded=h; +if(j.isReadyToBind()){if(e){e();}else{j.initialize();}}else{if(j.triesLeft-->0){j.imgTimeout=window.setTimeout(l,200); +}else{j.imageLoadError.call(j);}}};c.imageLoadError=function(f){clearTimeout(this.imgTimeout); +this.triesLeft=0;var g=f?"The image "+f.target.src+" failed to load.":"The images never seemed to finish loading. You may just need to increase the configTimeout if images could take a long time to load."; +throw g;};c.altImage=function(e){return this.images[this.altImagesXref[e]];};c.wrapId=function(){return"mapster_wrap_"+this.index; +};c._idFromKey=function(e){return typeof e==="string"&&this._xref.hasOwnProperty(e)?this._xref[e]:-1; +};c.getSelected=function(){var e="";a.each(this.data,function(g,f){if(f.isSelected()){e+=(e?",":"")+this.key; +}});return e;};c.getAllDataForArea=function(f,g){var h,e,l,k=this,j=a(f).filter("area").attr(k.options.mapKey); +if(j){l=[];j=d.split(j);for(h=0;h<(g||j.length);h++){e=k.data[k._idFromKey(j[h])]; +e.area=f.length?f[0]:f;l.push(e);}}return l;};c.getDataForArea=function(f){var e=this.getAllDataForArea(f,1); +return e?e[0]||null:null;};c.getDataForKey=function(e){return this.data[this._idFromKey(e)]; +};c.getKeysForGroup=function(f){var e=this.getDataForKey(f);return !e?"":e.isPrimary?e.key:this.getPrimaryKeysForMapAreas(e.areas()).join(","); +};c.getPrimaryKeysForMapAreas=function(e){var f=[];a.each(e,function(h,g){if(a.inArray(g.keys[0],f)<0){f.push(g.keys[0]); +}});return f;};c.getData=function(e){if(typeof e==="string"){return this.getDataForKey(e); +}else{if(e&&e.mapster||d.isElement(e)){return this.getDataForArea(e);}else{return null; +}}};c.ensureNoHighlight=function(){var e;if(this.highlightId>=0){this.graphics.clearHighlight(); +e=this.data[this.highlightId];e.changeState("highlight",false);this.setHighlightId(-1); +}};c.setHighlightId=function(e){this.highlightId=e;};c.clearSelections=function(){a.each(this.data,function(g,f){if(f.selected){f.removeSelection(true); +}});this.removeSelectionFinish();};c.setAreaOptions=function(g){var h,f,e;g=g||[]; +for(h=g.length-1;h>=0;h--){f=g[h];if(f){e=this.getDataForKey(f.key);if(e){d.updateProps(e.options,f); +if(d.isBool(f.selected)){e.selected=f.selected;}}}}};c.drawSelections=function(g){var e,f=d.asArray(g); +for(e=f.length-1;e>=0;e--){this.data[f[e]].drawSelection();}};c.redrawSelections=function(){a.each(this.data,function(g,f){if(f.isSelectedOrStatic()){f.drawSelection(); +}});};c.initialize=function(){var j,e,m,s,n,f,g,p,h,q,r,o,k=this,l=k.options;if(k.complete){return; +}h=a(k.image);n=h.parent().attr("id");if(n&&n.length>=12&&n.substring(0,12)==="mapster_wrap"){s=h.parent(); +s.attr("id",k.wrapId());}else{s=a('<div id="'+k.wrapId()+'"></div>');if(l.wrapClass){if(l.wrapClass===true){s.addClass(h[0].className); +}else{s.addClass(l.wrapClass);}}}k.wrapper=s;k.scaleInfo=o=d.scaleMap(k.images[0],k.images[1],l.scaleMap); +e=k.graphics.createVisibleCanvas(k);m=k.graphics.createVisibleCanvas(k);k.base_canvas=e; +k.overlay_canvas=m;j=a(k.images[1]).addClass("mapster_el").addClass(k.images[0].className).attr({id:null,usemap:null}); +p=d.size(k.images[0]);if(p.complete){j.css({width:p.width,height:p.height});}k.buildDataset(); +f={display:"block",position:"relative",padding:0,width:o.width,height:o.height};if(l.wrapCss){a.extend(f,l.wrapCss); +}if(h.parent()[0]!==k.wrapper[0]){h.before(k.wrapper);}s.css(f);a(k.images.slice(2)).hide(); +for(g=1;g<k.images.length;g++){s.append(k.images[g]);}s.append(e).append(m).append(h.css(b.canvas_style)); +d.setOpacity(k.images[0],0);a(k.images[1]).show();d.setOpacity(k.images[1],1);if(l.isSelectable&&l.onGetList){r=k.data.slice(0); +if(l.sortList){if(l.sortList==="desc"){q=function(i,t){return i===t?0:(i>t?-1:1); +};}else{q=function(i,t){return i===t?0:(i<t?-1:1);};}r.sort(function(i,t){i=i.value; +t=t.value;return q(i,t);});}k.options.boundList=l.onGetList.call(k.image,r);}k.complete=true; +k.processCommandQueue();if(l.onConfigured&&typeof l.onConfigured==="function"){l.onConfigured.call(h,true); +}};c.buildDataset=function(w){var x,i,p,h,e,g,k,s,q,r,t,n,l,o,u=this,v=u.options,m; +function f(y,z){var j=new b.AreaData(u,y,z);j.areaId=u._xref[y]=u.data.push(j)-1; +return j.areaId;}u._xref={};u.data=[];if(!w){u.mapAreas=[];}m=!v.mapKey;if(m){v.mapKey="data-mapster-key"; +}x=(a.browser.msie&&a.browser.version<=7)?"area":(m?"area[coords]":"area["+v.mapKey+"]"); +i=a(u.map).find(x).unbind(".mapster");for(t=0;t<i.length;t++){h=0;g=i[t];e=a(g);if(!g.coords){continue; +}if(m){k=String(t);e.attr("data-mapster-key",k);}else{k=g.getAttribute(v.mapKey); +}if(w){s=u.mapAreas[e.data("mapster")-1];s.configure(k);}else{s=new b.MapArea(u,g,k); +u.mapAreas.push(s);}r=s.keys;for(p=r.length-1;p>=0;p--){q=r[p];if(v.mapValue){n=e.attr(v.mapValue); +}if(m){h=f(u.data.length,n);l=u.data[h];l.key=q=h.toString();}else{h=u._xref[q];if(h>=0){l=u.data[h]; +if(n&&!u.data[h].value){l.value=n;}}else{h=f(q,n);l=u.data[h];l.isPrimary=p===0;}}s.areaDataXref.push(h); +l.areasXref.push(t);}o=e.attr("href");if(o&&o!=="#"&&!l.href){l.href=o;}if(!s.nohref){e.bind("mouseover.mapster",u.mouseover).bind("mouseout.mapster",u.mouseout).bind("click.mapster",u.click).bind("mousedown.mapster",u.mousedown); +}e.data("mapster",t+1);}u.setAreaOptions(v.areas);u.redrawSelections();};c.processCommandQueue=function(){var e,f=this; +while(!f.currentAction&&f.commands.length){e=f.commands[0];f.commands.splice(0,1); +b.impl[e.command].apply(e.that,e.args);}};c.clearEvents=function(){a(this.map).find("area").unbind(".mapster"); +a(this.images).unbind(".mapster");};c._clearCanvases=function(e){if(!e){a(this.base_canvas).remove(); +}a(this.overlay_canvas).remove();};c.clearMapData=function(f){var e=this;this._clearCanvases(f); +a.each(this.data,function(h,g){g.reset();});this.data=null;if(!f){this.image.style.cssText=this.imgCssText; +a(this.wrapper).before(this.image).remove();}a.each(this.images,function(h,g){if(e.images[h]!==g.image){e.images[h]=null; +}});e.images=[];this.image=null;d.ifFunction(this.clearTooltip,this);};c.removeSelectionFinish=function(){var e=this.graphics; +e.refreshSelections();e.clearHighlight();};}(jQuery));(function(a){var c,b=a.mapster,d=b.utils; +b.AreaData=function(f,e,g){a.extend(this,{owner:f,key:e||"",isPrimary:true,areaId:-1,href:"",value:g||"",options:{},selected:null,areasXref:[],area:null,optsCache:null}); +};c=b.AreaData.prototype;c.areas=function(){var e,f=[];for(e=0;e<this.areasXref.length; +e++){f.push(this.owner.mapAreas[this.areasXref[e]]);}return f;};c.coords=function(f){var e=[]; +a.each(this.areas(),function(h,g){e=e.concat(g.coords(f));});return e;};c.reset=function(){a.each(this.areas(),function(g,f){f.reset(); +});this.areasXref=[];this.options=null;};c.isSelectedOrStatic=function(){var e=this.effectiveOptions(); +return d.isBool(e.staticState)?e.staticState:this.isSelected();};c.isSelected=function(){return d.isBool(this.selected)?this.selected:d.isBool(this.owner.area_options.selected)?this.owner.area_options.selected:false; +};c.isSelectable=function(){return d.isBool(this.effectiveOptions().staticState)?false:(d.isBool(this.owner.options.staticState)?false:d.boolOrDefault(this.effectiveOptions().isSelectable,true)); +};c.isDeselectable=function(){return d.isBool(this.effectiveOptions().staticState)?false:(d.isBool(this.owner.options.staticState)?false:d.boolOrDefault(this.effectiveOptions().isDeselectable,true)); +};c.isNotRendered=function(){var e=a(this.area);return e.attr("nohref")||!e.attr("href")||this.effectiveOptions().isMask; +};c.effectiveOptions=function(f){var e=d.updateProps({},this.owner.area_options,this.options,f||{},{id:this.areaId}); +e.selected=this.isSelected();return e;};c.effectiveRenderOptions=function(f,h){var e,g=this.optsCache; +if(!g||f==="highlight"){e=this.effectiveOptions(h);g=d.updateProps({},e,e["render_"+f],{alt_image:this.owner.altImage(f)}); +if(f!=="highlight"){this.optsCache=g;}}return a.extend({},g);};c.changeState=function(f,e){if(a.isFunction(this.owner.options.onStateChange)){this.owner.options.onStateChange.call(this.owner.image,{key:this.key,state:f,selected:e}); +}};c.highlight=function(f){var e=this.owner;if(this.effectiveOptions().highlight){e.graphics.addShapeGroup(this,"highlight",f); +}e.setHighlightId(this.areaId);this.changeState("highlight",true);};c.drawSelection=function(){this.owner.graphics.addShapeGroup(this,"select"); +};c.addSelection=function(f){var e=this.owner;if(e.options.singleSelect){e.clearSelections(); +}if(!this.isSelected()){if(f){this.optsCache=a.extend(this.effectiveRenderOptions("select"),f); +}this.drawSelection();if(f){this.optsCache=null;}this.selected=true;this.changeState("select",true); +}if(e.options.singleSelect){e.graphics.refreshSelections();}};c.removeSelection=function(e){this.selected=false; +this.changeState("select",false);this.optsCache=null;this.owner.graphics.removeSelections(this.areaId); +if(!e){this.owner.removeSelectionFinish();}};c.toggleSelection=function(e){if(!this.isSelected()){this.addSelection(e); +}else{this.removeSelection();}return this.isSelected();};b.MapArea=function(h,e,f){if(!h){return; +}var g=this;g.owner=h;g.area=e;g.areaDataXref=[];g.originalCoords=[];a.each(d.split(e.coords),function(k,j){g.originalCoords.push(parseFloat(j)); +});g.length=g.originalCoords.length;g.shape=e.shape.toLowerCase();g.nohref=e.nohref||!e.href; +g.configure(f);};b.MapArea.prototype.configure=function(e){this.keys=d.split(e);}; +b.MapArea.prototype.reset=function(){this.area=null;};b.MapArea.prototype.coords=function(e){return a.map(this.originalCoords,function(f){return e?f:f+e; +});};}(jQuery));(function(a){var b=a.mapster.utils;b.areaCorners=function(e,x,o){var n,t,u,r,s,h,f,i,g,l,m,v,q,p,w,c,d,k=[]; +for(q=0;q<e.length;q++){d=e[q];p=b.split(d.coords,parseInt);switch(d.shape){case"circle":l=p[0]; +m=p[1];w=p[2];k=[];for(q=0;q<360;q+=20){c=q*Math.PI/180;k.push(l+w*Math.cos(c),m+w*Math.sin(c)); +}break;case"rect":k.push(p[0],p[1],p[2],p[1],p[2],p[3],p[0],p[3]);break;default:k=k.concat(p); +break;}}t=u=h=i=999999;r=s=f=g=-1;for(q=k.length-2;q>=0;q-=2){l=parseInt(k[q],10); +m=parseInt(k[q+1],10);if(l<t){t=l;g=m;}if(l>r){r=l;i=m;}if(m<u){u=m;f=l;}if(m>s){s=m; +h=l;}}if(x&&o){n=false;a.each([[f-x,u-o],[h,u-o],[t-x,g-o],[t-x,i],[r,g-o],[r,i],[f-x,s],[h,s]],function(y,j){if(!n&&(j[0]>0&&j[1]>0)){v=j; +n=true;return false;}});if(!n){v=[r,s];}}return{tl:[t,u],br:[r,s],tt:v};};}(jQuery)); +(function(a){var e=a.mapster_when,b=a.mapster,d=b.utils,c=b.MapArea.prototype;b.utils.getScaleInfo=function(g,f){var h; +if(!f){h=1;f=g;}else{h=g.width/f.width||g.height/f.height;if(h>0.98&&h<1.02){h=1; +}}return{scale:(h!==1),scalePct:h,realWidth:f.width,realHeight:f.height,width:g.width,height:g.height,ratio:g.width/g.height}; +};b.utils.scaleMap=function(f,g,i){var j=d.size(f),h=d.size(g);if(!h.complete){throw ("Another script, such as an extension, appears to be interfering with image loading. Please let us know about this."); +}if(!j.complete){j=h;}return this.getScaleInfo(j,i?h:null);};b.MapData.prototype.resize=function(r,o,i,f){var t,u,m,v,y,l,h,s={callback:f||i},q,j,n=this; +function x(p,A,z){if(a.mapster.hasCanvas){p.width=A;p.height=z;}else{a(p).width(A); +a(p).height(z);}}function g(){n.currentAction="";if(a.isFunction(s.callback)){s.callback(); +}n.processCommandQueue();}function k(){x(n.overlay_canvas,y,l);if(s.highlight&&m>=0){var p=n.data[m]; +p.tempOptions={fade:false};n.getDataForKey(p.key).highlight();p.tempOptions=null; +}x(n.base_canvas,y,l);n.redrawSelections();g();}function w(){a(n.image).css(q);n.scaleInfo=d.getScaleInfo({width:y,height:l},{width:n.scaleInfo.realWidth,height:n.scaleInfo.realHeight}); +a.each(n.data,function(z,p){a.each(p.areas(),function(B,A){A.resize();});});}if(typeof r==="object"){s=r; +}else{s.width=r;s.height=o;s.duration=i||0;}y=s.width;l=s.height;h=s.duration;if(n.scaleInfo.width===y&&n.scaleInfo.height===l){return; +}m=n.highlightId;if(!y){v=l/n.scaleInfo.realHeight;y=Math.round(n.scaleInfo.realWidth*v); +}if(!l){v=y/n.scaleInfo.realWidth;l=Math.round(n.scaleInfo.realHeight*v);}q={width:String(y)+"px",height:String(l)+"px"}; +if(!a.mapster.hasCanvas){a(n.base_canvas).children().remove();}j=a(n.wrapper).find(".mapster_el").add(n.wrapper); +if(h){u=[];n.currentAction="resizing";j.each(function(z,p){t=e.defer();u.push(t); +a(p).animate(q,{duration:h,complete:t.resolve,easing:"linear"});});t=e.defer();u.push(t); +e.all(u).then(k);w();t.resolve();}else{j.css(q);w();k();}};b.MapArea=d.subclass(b.MapArea,function(){this.base.init(); +if(this.owner.scaleInfo.scale){this.resize();}});c.coords=function(l,f){var g,h=[],k=l||this.owner.scaleInfo.scalePct,i=f||0; +if(k===1&&f===0){return this.originalCoords;}for(g=0;g<this.length;g++){h.push(Math.round(this.originalCoords[g]*k)+i); +}return h;};c.resize=function(){this.area.coords=this.coords().join(",");};c.reset=function(){this.area.coords=this.coords(1).join(","); +};b.impl.resize=function(h,g,f){if(!h&&!g){return false;}var i=(new b.Method(this,function(){this.resize(h,g,f); +},null,{name:"resize",args:arguments})).go();return i;};b.impl.zoom=function(f,h){var g=h||{}; +function i(j){var x,k,n,B,u,l,m,v,w,r,s,q,p,z,A,t=g.padding||0,y=j?20:0,o=this,C=false; +if(j){if(!o.zoomed){o.zoomed=true;o.preZoomWidth=o.scaleInfo.width;o.preZoomHeight=o.scaleInfo.height; +o.zoomedArea=j;if(g.scroll){o.wrapper.css({overflow:"auto"});}}k=a.mapster.utils.areaCorners(j.coords(1,0)); +B=o.wrapper.innerWidth()-y-t*2;n=o.wrapper.innerHeight()-y-t*2;l=k.maxX-k.minX;m=k.maxY-k.minY; +v=B/l;w=n/m;u=Math.min(v,w);r=(B-l*u)/2;s=(n-m*u)/2;q=o.scaleInfo.realWidth*u;p=o.scaleInfo.realHeight*u; +z=(k.minX)*u-t-r;A=(k.minY)*u-t-s;}else{if(!o.zoomed){return;}C=true;q=o.preZoomWidth; +p=o.preZoomHeight;z=null;A=null;}this.resize({width:q,height:p,duration:g.duration,scroll:x,scrollLeft:z,scrollTop:A,callback:(function(){var E=C,F=g.scroll,D=j; +return function(){if(E){o.preZoomWidth=null;o.preZoomHeight=null;o.zoomed=false;o.zoomedArea=false; +if(F){o.wrapper.css({overflow:"inherit"});}}else{o.zoomedArea=D;}};}())});}return(new b.Method(this,function(j){i.call(this); +},function(){i.call(this.owner,this);},{name:"zoom",args:arguments,first:true,key:f})).go(); +};}(jQuery));(function(a){var b=a.mapster,c=b.utils;a.extend(b.defaults,{toolTipContainer:'<div style="border: 2px solid black; background: #EEEEEE; position:absolute; width:160px; padding:4px; margin: 4px; -moz-box-shadow: 3px 3px 5px #535353; -webkit-box-shadow: 3px 3px 5px #535353; box-shadow: 3px 3px 5px #535353; -moz-border-radius: 6px 6px 6px 6px; -webkit-border-radius: 6px; border-radius: 6px 6px 6px 6px;"></div>',showToolTip:false,toolTipFade:true,toolTipClose:["area-mouseout","image-mouseout"],onShowToolTip:null,onCreateTooltip:null}); +a.extend(b.area_defaults,{toolTip:null});b.MapData.prototype.clearTooltip=function(){if(this.activeToolTip){this.activeToolTip.stop().remove(); +this.activeToolTip=null;this.activeToolTipID=-1;}a.each(this._tooltip_events,function(f,d){d.object.unbind(d.event); +});};b.MapData.prototype.bindTooltipClose=function(i,e,h,d){var f=e+".mapster-tooltip",g=this; +if(a.inArray(i,this.options.toolTipClose)>=0){h.unbind(f).bind(f,function(j){if(!d||d.call(this,j)){g.clearTooltip(); +}});this._tooltip_events.push({object:h,event:f,callback:d});}};b.AreaData.prototype.showTooltip=function(){var i,l,m,g,d,f,j=this.effectiveOptions(),h=this.owner,e=h.options,k=h.options.toolTipContainer; +h.cancelClear=true;if(h.activeToolTipID===this.areaId){return;}if(typeof k==="string"){f=a(k); +}else{f=a(k).clone();}l=f.html(j.toolTip).hide();h.clearTooltip();a("body").append(l); +h.activeToolTip=l;h.activeToolTipID=this.areaId;c.setOpacity(l[0],0);l.show();d=this.area?[this.area]:a.map(this.areas(),function(n){return n.area; +});g=c.areaCorners(d,l.outerWidth(true),l.outerHeight(true));i=a(h.image).offset(); +m={left:i.left+g.tt[0]+"px",top:i.top+g.tt[1]+"px"};if(parseInt(l.css("z-index"),10)===0||l.css("z-index")==="auto"){m["z-index"]=9999; +}l.css(m).addClass("mapster_tooltip");h.bindTooltipClose("area-click","click",a(h.map)); +h.bindTooltipClose("tooltip-click","click",l);h.bindTooltipClose("image-mouseout","mouseout",a(h.image),function(n){return(n.relatedTarget.nodeName!=="AREA"&&n.relatedTarget!==this); +});if(h.options.toolTipFade){c.fader(l[0],0,1,j.fadeDuration);}else{c.setOpacity(l[0],1); +}c.ifFunction(e.onShowToolTip,this.area||null,{toolTip:l,areaOptions:j,key:this.key,selected:this.isSelected()}); +};b.impl.tooltip=function(d){return(new b.Method(this,function(){this.clearTooltip(); +},function(){if(this.effectiveOptions().toolTip){this.showTooltip();}},{name:"tooltip",args:arguments,key:d})).go(); +};}(jQuery)); \ No newline at end of file

1 0

r530 - in trunk: src wp-theme
by Mario Gallegos 31 Oct '12

31 Oct '12

Author: mgallegos Date: 2012-10-31 17:50:13 +0100 (Wed, 31 Oct 2012) New Revision: 530 Removed: trunk/src/jquery.blockUI.js trunk/src/jquery.bxSlider.js trunk/src/jquery.bxSlider.min.js trunk/src/jquery.checkbox.css trunk/src/jquery.checkbox.min.js trunk/src/jquery.easySlider.css trunk/src/jquery.easySlider1.7.js Modified: trunk/wp-theme/mc2-form.php Log: Deleted: trunk/src/jquery.blockUI.js =================================================================== --- trunk/src/jquery.blockUI.js 2012-10-31 16:41:06 UTC (rev 529) +++ trunk/src/jquery.blockUI.js 2012-10-31 16:50:13 UTC (rev 530) @@ -1,499 +0,0 @@ -/*! - * jQuery blockUI plugin - * Version 2.39 (23-MAY-2011) - * @requires jQuery v1.2.3 or later - * - * Examples at: http://malsup.com/jquery/block/ - * Copyright (c) 2007-2010 M. Alsup - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - * Thanks to Amir-Hossein Sobhi for some excellent contributions! - */ - -;(function($) { - -if (/1\.(0|1|2)\.(0|1|2)/.test($.fn.jquery) || /^1.1/.test($.fn.jquery)) { - alert('blockUI requires jQuery v1.2.3 or later! You are using v' + $.fn.jquery); - return; -} - -$.fn._fadeIn = $.fn.fadeIn; - -var noOp = function() {}; - -// this bit is to ensure we don't call setExpression when we shouldn't (with extra muscle to handle -// retarded userAgent strings on Vista) -var mode = document.documentMode || 0; -var setExpr = $.browser.msie && (($.browser.version < 8 && !mode) || mode < 8); -var ie6 = $.browser.msie && /MSIE 6.0/.test(navigator.userAgent) && !mode; - -// global $ methods for blocking/unblocking the entire page -$.blockUI = function(opts) { install(window, opts); }; -$.unblockUI = function(opts) { remove(window, opts); }; - -// convenience method for quick growl-like notifications (http://www.google.com/search?q=growl) -$.growlUI = function(title, message, timeout, onClose) { - var $m = $('<div class="growlUI"></div>'); - if (title) $m.append('<h1>'+title+'</h1>'); - if (message) $m.append('<h2>'+message+'</h2>'); - if (timeout == undefined) timeout = 3000; - $.blockUI({ - message: $m, fadeIn: 700, fadeOut: 1000, centerY: false, - timeout: timeout, showOverlay: false, - onUnblock: onClose, - css: $.blockUI.defaults.growlCSS - }); -}; - -// plugin method for blocking element content -$.fn.block = function(opts) { - return this.unblock({ fadeOut: 0 }).each(function() { - if ($.css(this,'position') == 'static') - this.style.position = 'relative'; - if ($.browser.msie) - this.style.zoom = 1; // force 'hasLayout' - install(this, opts); - }); -}; - -// plugin method for unblocking element content -$.fn.unblock = function(opts) { - return this.each(function() { - remove(this, opts); - }); -}; - -$.blockUI.version = 2.39; // 2nd generation blocking at no extra cost! - -// override these in your code to change the default behavior and style -$.blockUI.defaults = { - // message displayed when blocking (use null for no message) - message: '<h1>Please wait...</h1>', - - title: null, // title string; only used when theme == true - draggable: true, // only used when theme == true (requires jquery-ui.js to be loaded) - - theme: false, // set to true to use with jQuery UI themes - - // styles for the message when blocking; if you wish to disable - // these and use an external stylesheet then do this in your code: - // $.blockUI.defaults.css = {}; - css: { - padding: 0, - margin: 0, - width: '30%', - top: '40%', - left: '35%', - textAlign: 'center', - color: '#000', - border: '3px solid #000', - backgroundColor:'#fff', - cursor: 'default' - }, - - // minimal style set used when themes are used - themedCSS: { - width: '30%', - top: '40%', - left: '35%' - }, - - // styles for the overlay - overlayCSS: { - backgroundColor: '#000', - opacity: 0.4, - cursor: 'default' - }, - - // styles applied when using $.growlUI - growlCSS: { - width: '350px', - top: '10px', - left: '', - right: '10px', - border: '1px solid #FFFFFF', - padding: '5px', - opacity: 0.4, - cursor: 'default', - color: '#fff', - backgroundColor: '#000', - '-webkit-border-radius': '10px', - '-moz-border-radius': '10px', - 'border-radius': '10px' - }, - - // IE issues: 'about:blank' fails on HTTPS and javascript:false is s-l-o-w - // (hat tip to Jorge H. N. de Vasconcelos) - iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank', - - // force usage of iframe in non-IE browsers (handy for blocking applets) - forceIframe: false, - - // z-index for the blocking overlay - baseZ: 1000, - - // set these to true to have the message automatically centered - centerX: true, // <-- only effects element blocking (page block controlled via css above) - centerY: true, - - // allow body element to be stetched in ie6; this makes blocking look better - // on "short" pages. disable if you wish to prevent changes to the body height - allowBodyStretch: true, - - // enable if you want key and mouse events to be disabled for content that is blocked - bindEvents: true, - - // be default blockUI will supress tab navigation from leaving blocking content - // (if bindEvents is true) - constrainTabKey: true, - - // fadeIn time in millis; set to 0 to disable fadeIn on block - fadeIn: 200, - - // fadeOut time in millis; set to 0 to disable fadeOut on unblock - fadeOut: 400, - - // time in millis to wait before auto-unblocking; set to 0 to disable auto-unblock - timeout: 0, - - // disable if you don't want to show the overlay - showOverlay: true, - - // if true, focus will be placed in the first available input field when - // page blocking - focusInput: true, - - // suppresses the use of overlay styles on FF/Linux (due to performance issues with opacity) - applyPlatformOpacityRules: true, - - // callback method invoked when fadeIn has completed and blocking message is visible - onBlock: null, - - // callback method invoked when unblocking has completed; the callback is - // passed the element that has been unblocked (which is the window object for page - // blocks) and the options that were passed to the unblock call: - // onUnblock(element, options) - onUnblock: null, - - // don't ask; if you really must know: http://groups.google.com/group/jquery-en/browse_thread/thread/36640a8730503… - quirksmodeOffsetHack: 4, - - // class name of the message block - blockMsgClass: 'blockMsg' -}; - -// private data and functions follow... - -var pageBlock = null; -var pageBlockEls = []; - -function install(el, opts) { - var full = (el == window); - var msg = opts && opts.message !== undefined ? opts.message : undefined; - opts = $.extend({}, $.blockUI.defaults, opts || {}); - opts.overlayCSS = $.extend({}, $.blockUI.defaults.overlayCSS, opts.overlayCSS || {}); - var css = $.extend({}, $.blockUI.defaults.css, opts.css || {}); - var themedCSS = $.extend({}, $.blockUI.defaults.themedCSS, opts.themedCSS || {}); - msg = msg === undefined ? opts.message : msg; - - // remove the current block (if there is one) - if (full && pageBlock) - remove(window, {fadeOut:0}); - - // if an existing element is being used as the blocking content then we capture - // its current place in the DOM (and current display style) so we can restore - // it when we unblock - if (msg && typeof msg != 'string' && (msg.parentNode || msg.jquery)) { - var node = msg.jquery ? msg[0] : msg; - var data = {}; - $(el).data('blockUI.history', data); - data.el = node; - data.parent = node.parentNode; - data.display = node.style.display; - data.position = node.style.position; - if (data.parent) - data.parent.removeChild(node); - } - - $(el).data('blockUI.onUnblock', opts.onUnblock); - var z = opts.baseZ; - - // blockUI uses 3 layers for blocking, for simplicity they are all used on every platform; - // layer1 is the iframe layer which is used to supress bleed through of underlying content - // layer2 is the overlay layer which has opacity and a wait cursor (by default) - // layer3 is the message content that is displayed while blocking - - var lyr1 = ($.browser.msie || opts.forceIframe) - ? $('<iframe class="blockUI" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;position:absolute;width:100%;height:100%;top:0;left:0" src="'+opts.iframeSrc+'"></iframe>') - : $('<div class="blockUI" style="display:none"></div>'); - - var lyr2 = opts.theme - ? $('<div class="blockUI blockOverlay ui-widget-overlay" style="z-index:'+ (z++) +';display:none"></div>') - : $('<div class="blockUI blockOverlay" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;width:100%;height:100%;top:0;left:0"></div>'); - - var lyr3, s; - if (opts.theme && full) { - s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage ui-dialog ui-widget ui-corner-all" style="z-index:'+(z+10)+';display:none;position:fixed">' + - '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || ' ')+'</div>' + - '<div class="ui-widget-content ui-dialog-content"></div>' + - '</div>'; - } - else if (opts.theme) { - s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement ui-dialog ui-widget ui-corner-all" style="z-index:'+(z+10)+';display:none;position:absolute">' + - '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || ' ')+'</div>' + - '<div class="ui-widget-content ui-dialog-content"></div>' + - '</div>'; - } - else if (full) { - s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage" style="z-index:'+(z+10)+';display:none;position:fixed"></div>'; - } - else { - s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement" style="z-index:'+(z+10)+';display:none;position:absolute"></div>'; - } - lyr3 = $(s); - - // if we have a message, style it - if (msg) { - if (opts.theme) { - lyr3.css(themedCSS); - lyr3.addClass('ui-widget-content'); - } - else - lyr3.css(css); - } - - // style the overlay - if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform)))) - lyr2.css(opts.overlayCSS); - lyr2.css('position', full ? 'fixed' : 'absolute'); - - // make iframe layer transparent in IE - if ($.browser.msie || opts.forceIframe) - lyr1.css('opacity',0.0); - - //$([lyr1[0],lyr2[0],lyr3[0]]).appendTo(full ? 'body' : el); - var layers = [lyr1,lyr2,lyr3], $par = full ? $('body') : $(el); - $.each(layers, function() { - this.appendTo($par); - }); - - if (opts.theme && opts.draggable && $.fn.draggable) { - lyr3.draggable({ - handle: '.ui-dialog-titlebar', - cancel: 'li' - }); - } - - // ie7 must use absolute positioning in quirks mode and to account for activex issues (when scrolling) - var expr = setExpr && (!$.boxModel || $('object,embed', full ? null : el).length > 0); - if (ie6 || expr) { - // give body 100% height - if (full && opts.allowBodyStretch && $.boxModel) - $('html,body').css('height','100%'); - - // fix ie6 issue when blocked element has a border width - if ((ie6 || !$.boxModel) && !full) { - var t = sz(el,'borderTopWidth'), l = sz(el,'borderLeftWidth'); - var fixT = t ? '(0 - '+t+')' : 0; - var fixL = l ? '(0 - '+l+')' : 0; - } - - // simulate fixed position - $.each([lyr1,lyr2,lyr3], function(i,o) { - var s = o[0].style; - s.position = 'absolute'; - if (i < 2) { - full ? s.setExpression('height','Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.boxModel?0:'+opts.quirksmodeOffsetHack+') + "px"') - : s.setExpression('height','this.parentNode.offsetHeight + "px"'); - full ? s.setExpression('width','jQuery.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"') - : s.setExpression('width','this.parentNode.offsetWidth + "px"'); - if (fixL) s.setExpression('left', fixL); - if (fixT) s.setExpression('top', fixT); - } - else if (opts.centerY) { - if (full) s.setExpression('top','(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"'); - s.marginTop = 0; - } - else if (!opts.centerY && full) { - var top = (opts.css && opts.css.top) ? parseInt(opts.css.top) : 0; - var expression = '((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"'; - s.setExpression('top',expression); - } - }); - } - - // show the message - if (msg) { - if (opts.theme) - lyr3.find('.ui-widget-content').append(msg); - else - lyr3.append(msg); - if (msg.jquery || msg.nodeType) - $(msg).show(); - } - - if (($.browser.msie || opts.forceIframe) && opts.showOverlay) - lyr1.show(); // opacity is zero - if (opts.fadeIn) { - var cb = opts.onBlock ? opts.onBlock : noOp; - var cb1 = (opts.showOverlay && !msg) ? cb : noOp; - var cb2 = msg ? cb : noOp; - if (opts.showOverlay) - lyr2._fadeIn(opts.fadeIn, cb1); - if (msg) - lyr3._fadeIn(opts.fadeIn, cb2); - } - else { - if (opts.showOverlay) - lyr2.show(); - if (msg) - lyr3.show(); - if (opts.onBlock) - opts.onBlock(); - } - - // bind key and mouse events - bind(1, el, opts); - - if (full) { - pageBlock = lyr3[0]; - pageBlockEls = $(':input:enabled:visible',pageBlock); - if (opts.focusInput) - setTimeout(focus, 20); - } - else - center(lyr3[0], opts.centerX, opts.centerY); - - if (opts.timeout) { - // auto-unblock - var to = setTimeout(function() { - full ? $.unblockUI(opts) : $(el).unblock(opts); - }, opts.timeout); - $(el).data('blockUI.timeout', to); - } -}; - -// remove the block -function remove(el, opts) { - var full = (el == window); - var $el = $(el); - var data = $el.data('blockUI.history'); - var to = $el.data('blockUI.timeout'); - if (to) { - clearTimeout(to); - $el.removeData('blockUI.timeout'); - } - opts = $.extend({}, $.blockUI.defaults, opts || {}); - bind(0, el, opts); // unbind events - - if (opts.onUnblock === null) { - opts.onUnblock = $el.data('blockUI.onUnblock'); - $el.removeData('blockUI.onUnblock'); - } - - var els; - if (full) // crazy selector to handle odd field errors in ie6/7 - els = $('body').children().filter('.blockUI').add('body > .blockUI'); - else - els = $('.blockUI', el); - - if (full) - pageBlock = pageBlockEls = null; - - if (opts.fadeOut) { - els.fadeOut(opts.fadeOut); - setTimeout(function() { reset(els,data,opts,el); }, opts.fadeOut); - } - else - reset(els, data, opts, el); -}; - -// move blocking element back into the DOM where it started -function reset(els,data,opts,el) { - els.each(function(i,o) { - // remove via DOM calls so we don't lose event handlers - if (this.parentNode) - this.parentNode.removeChild(this); - }); - - if (data && data.el) { - data.el.style.display = data.display; - data.el.style.position = data.position; - if (data.parent) - data.parent.appendChild(data.el); - $(el).removeData('blockUI.history'); - } - - if (typeof opts.onUnblock == 'function') - opts.onUnblock(el,opts); -}; - -// bind/unbind the handler -function bind(b, el, opts) { - var full = el == window, $el = $(el); - - // don't bother unbinding if there is nothing to unbind - if (!b && (full && !pageBlock || !full && !$el.data('blockUI.isBlocked'))) - return; - if (!full) - $el.data('blockUI.isBlocked', b); - - // don't bind events when overlay is not in use or if bindEvents is false - if (!opts.bindEvents || (b && !opts.showOverlay)) - return; - - // bind anchors and inputs for mouse and key events - var events = 'mousedown mouseup keydown keypress'; - b ? $(document).bind(events, opts, handler) : $(document).unbind(events, handler); - -// former impl... -// var $e = $('a,:input'); -// b ? $e.bind(events, opts, handler) : $e.unbind(events, handler); -}; - -// event handler to suppress keyboard/mouse events when blocking -function handler(e) { - // allow tab navigation (conditionally) - if (e.keyCode && e.keyCode == 9) { - if (pageBlock && e.data.constrainTabKey) { - var els = pageBlockEls; - var fwd = !e.shiftKey && e.target === els[els.length-1]; - var back = e.shiftKey && e.target === els[0]; - if (fwd || back) { - setTimeout(function(){focus(back)},10); - return false; - } - } - } - var opts = e.data; - // allow events within the message content - if ($(e.target).parents('div.' + opts.blockMsgClass).length > 0) - return true; - - // allow events for content that is not being blocked - return $(e.target).parents().children().filter('div.blockUI').length == 0; -}; - -function focus(back) { - if (!pageBlockEls) - return; - var e = pageBlockEls[back===true ? pageBlockEls.length-1 : 0]; - if (e) - e.focus(); -}; - -function center(el, x, y) { - var p = el.parentNode, s = el.style; - var l = ((p.offsetWidth - el.offsetWidth)/2) - sz(p,'borderLeftWidth'); - var t = ((p.offsetHeight - el.offsetHeight)/2) - sz(p,'borderTopWidth'); - if (x) s.left = l > 0 ? (l+'px') : '0'; - if (y) s.top = t > 0 ? (t+'px') : '0'; -}; - -function sz(el, p) { - return parseInt($.css(el,p))||0; -}; - -})(jQuery); Deleted: trunk/src/jquery.bxSlider.js =================================================================== --- trunk/src/jquery.bxSlider.js 2012-10-31 16:41:06 UTC (rev 529) +++ trunk/src/jquery.bxSlider.js 2012-10-31 16:50:13 UTC (rev 530) @@ -1,1265 +0,0 @@ -/** - * jQuery bxSlider v3.0 - * http://bxslider.com - * - * Copyright 2011, Steven Wanderski - * http://bxcreative.com - * - * Free to use and abuse under the MIT license. - * http://www.opensource.org/licenses/mit-license.php - * - */ - - -(function($){ - - $.fn.bxSlider = function(options){ - - var defaults = { - mode: 'horizontal', // 'horizontal', 'vertical', 'fade' - infiniteLoop: false, // true, false - display first slide after last - hideControlOnEnd: true, // true, false - if true, will hide 'next' control on last slide and 'prev' control on first - controls: true, // true, false - previous and next controls - speed: 500, // integer - in ms, duration of time slide transitions will occupy - easing: 'swing', // used with jquery.easing.1.3.js - see http://gsgd.co.uk/sandbox/jquery/easing/ for available options - pager: false, // true / false - display a pager - pagerSelector: null, // jQuery selector - element to contain the pager. ex: '#pager' - pagerType: 'full', // 'full', 'short' - if 'full' pager displays 1,2,3... if 'short' pager displays 1 / 4 - pagerLocation: 'bottom', // 'bottom', 'top' - location of pager - pagerShortSeparator: '/', // string - ex: 'of' pager would display 1 of 4 - pagerActiveClass: 'pager-active', // string - classname attached to the active pager link - nextText: 'next', // string - text displayed for 'next' control - nextImage: '', // string - filepath of image used for 'next' control. ex: 'images/next.jpg' - nextSelector: null, // jQuery selector - element to contain the next control. ex: '#next' - prevText: 'prev', // string - text displayed for 'previous' control - prevImage: '', // string - filepath of image used for 'previous' control. ex: 'images/prev.jpg' - prevSelector: null, // jQuery selector - element to contain the previous control. ex: '#next' - captions: false, // true, false - display image captions (reads the image 'title' tag) - captionsSelector: null, // jQuery selector - element to contain the captions. ex: '#captions' - auto: false, // true, false - make slideshow change automatically - autoDirection: 'next', // 'next', 'prev' - direction in which auto show will traverse - autoControls: false, // true, false - show 'start' and 'stop' controls for auto show - autoControlsSelector: null, // jQuery selector - element to contain the auto controls. ex: '#auto-controls' - autoStart: true, // true, false - if false show will wait for 'start' control to activate - autoHover: false, // true, false - if true show will pause on mouseover - autoDelay: 0, // integer - in ms, the amount of time before starting the auto show - pause: 3000, // integer - in ms, the duration between each slide transition - startText: 'start', // string - text displayed for 'start' control - startImage: '', // string - filepath of image used for 'start' control. ex: 'images/start.jpg' - stopText: 'stop', // string - text displayed for 'stop' control - stopImage: '', // string - filepath of image used for 'stop' control. ex: 'images/stop.jpg' - ticker: false, // true, false - continuous motion ticker mode (think news ticker) - // note: autoControls, autoControlsSelector, and autoHover apply to ticker! - tickerSpeed: 5000, // float - use value between 1 and 5000 to determine ticker speed - the smaller the value the faster the ticker speed - tickerDirection: 'next', // 'next', 'prev' - direction in which ticker show will traverse - tickerHover: false, // true, false - if true ticker will pause on mouseover - wrapperClass: 'bx-wrapper', // string - classname attached to the slider wraper - startingSlide: 0, // integer - show will start on specified slide. note: slides are zero based! - displaySlideQty: 1, // integer - number of slides to display at once - moveSlideQty: 1, // integer - number of slides to move at once - randomStart: false, // true, false - if true show will start on a random slide - onBeforeSlide: function(){}, // function(currentSlideNumber, totalSlideQty, currentSlideHtmlObject) - advanced use only! see the tutorial here: http://bxslider.com/custom-pager - onAfterSlide: function(){}, // function(currentSlideNumber, totalSlideQty, currentSlideHtmlObject) - advanced use only! see the tutorial here: http://bxslider.com/custom-pager - onLastSlide: function(){}, // function(currentSlideNumber, totalSlideQty, currentSlideHtmlObject) - advanced use only! see the tutorial here: http://bxslider.com/custom-pager - onFirstSlide: function(){}, // function(currentSlideNumber, totalSlideQty, currentSlideHtmlObject) - advanced use only! see the tutorial here: http://bxslider.com/custom-pager - onNextSlide: function(){}, // function(currentSlideNumber, totalSlideQty, currentSlideHtmlObject) - advanced use only! see the tutorial here: http://bxslider.com/custom-pager - onPrevSlide: function(){}, // function(currentSlideNumber, totalSlideQty, currentSlideHtmlObject) - advanced use only! see the tutorial here: http://bxslider.com/custom-pager - buildPager: null // function(slideIndex, slideHtmlObject){ return string; } - advanced use only! see the tutorial here: http://bxslider.com/custom-pager - } - - var options = $.extend(defaults, options); - - // cache the base element - var base = this; - // initialize (and localize) all variables - var $parent = ''; - var $origElement = ''; - var $children = ''; - var $outerWrapper = ''; - var $firstChild = ''; - var childrenWidth = ''; - var childrenOuterWidth = ''; - var wrapperWidth = ''; - var wrapperHeight = ''; - var $pager = ''; - var interval = ''; - var $autoControls = ''; - var $stopHtml = ''; - var $startContent = ''; - var $stopContent = ''; - var autoPlaying = true; - var loaded = false; - var childrenMaxWidth = 0; - var childrenMaxHeight = 0; - var currentSlide = 0; - var origLeft = 0; - var origTop = 0; - var origShowWidth = 0; - var origShowHeight = 0; - var tickerLeft = 0; - var tickerTop = 0; - var isWorking = false; - - var firstSlide = 0; - var lastSlide = $children.length - 1; - - - // PUBLIC FUNCTIONS - - /** - * Go to specified slide - */ - this.goToSlide = function(number, stopAuto){ - if(!isWorking){ - isWorking = true; - // set current slide to argument - currentSlide = number; - options.onBeforeSlide(currentSlide, $children.length, $children.eq(currentSlide)); - // check if stopAuto argument is supplied - if(typeof(stopAuto) == 'undefined'){ - var stopAuto = true; - } - if(stopAuto){ - // if show is auto playing, stop it - if(options.auto){ - base.stopShow(true); - } - } - slide = number; - // check for first slide callback - if(slide == firstSlide){ - options.onFirstSlide(currentSlide, $children.length, $children.eq(currentSlide)); - } - // check for last slide callback - if(slide == lastSlide){ - options.onLastSlide(currentSlide, $children.length, $children.eq(currentSlide)); - } - // horizontal - if(options.mode == 'horizontal'){ - $parent.animate({'left': '-'+getSlidePosition(slide, 'left')+'px'}, options.speed, options.easing, function(){ - isWorking = false; - // perform the callback function - options.onAfterSlide(currentSlide, $children.length, $children.eq(currentSlide)); - }); - // vertical - }else if(options.mode == 'vertical'){ - $parent.animate({'top': '-'+getSlidePosition(slide, 'top')+'px'}, options.speed, options.easing, function(){ - isWorking = false; - // perform the callback function - options.onAfterSlide(currentSlide, $children.length, $children.eq(currentSlide)); - }); - // fade - }else if(options.mode == 'fade'){ - setChildrenFade(); - } - // check to remove controls on last/first slide - checkEndControls(); - // accomodate multi slides - if(options.moveSlideQty > 1){ - number = Math.floor(number / options.moveSlideQty); - } - // make the current slide active - makeSlideActive(number); - // display the caption - showCaptions(); - } - } - - /** - * Go to next slide - */ - this.goToNextSlide = function(stopAuto){ - // check if stopAuto argument is supplied - if(typeof(stopAuto) == 'undefined'){ - var stopAuto = true; - } - if(stopAuto){ - // if show is auto playing, stop it - if(options.auto){ - base.stopShow(true); - } - } - // makes slideshow finite - if(!options.infiniteLoop){ - if(!isWorking){ - var slideLoop = false; - // make current slide the old value plus moveSlideQty - currentSlide = (currentSlide + (options.moveSlideQty)); - // if current slide has looped on itself - if(currentSlide <= lastSlide){ - checkEndControls(); - // next slide callback - options.onNextSlide(currentSlide, $children.length, $children.eq(currentSlide)); - // move to appropriate slide - base.goToSlide(currentSlide); - }else{ - currentSlide -= options.moveSlideQty; - } - } // end if(!isWorking) - }else{ - if(!isWorking){ - isWorking = true; - var slideLoop = false; - // make current slide the old value plus moveSlideQty - currentSlide = (currentSlide + options.moveSlideQty); - // if current slide has looped on itself - if(currentSlide > lastSlide){ - currentSlide = currentSlide % $children.length; - slideLoop = true; - } - // next slide callback - options.onNextSlide(currentSlide, $children.length, $children.eq(currentSlide)); - // slide before callback - options.onBeforeSlide(currentSlide, $children.length, $children.eq(currentSlide)); - if(options.mode == 'horizontal'){ - // get the new 'left' property for $parent - var parentLeft = (options.moveSlideQty * childrenOuterWidth); - // animate to the new 'left' - $parent.animate({'left': '-='+parentLeft+'px'}, options.speed, options.easing, function(){ - isWorking = false; - // if its time to loop, reset the $parent - if(slideLoop){ - $parent.css('left', '-'+getSlidePosition(currentSlide, 'left')+'px'); - } - // perform the callback function - options.onAfterSlide(currentSlide, $children.length, $children.eq(currentSlide)); - }); - }else if(options.mode == 'vertical'){ - // get the new 'left' property for $parent - var parentTop = (options.moveSlideQty * childrenMaxHeight); - // animate to the new 'left' - $parent.animate({'top': '-='+parentTop+'px'}, options.speed, options.easing, function(){ - isWorking = false; - // if its time to loop, reset the $parent - if(slideLoop){ - $parent.css('top', '-'+getSlidePosition(currentSlide, 'top')+'px'); - } - // perform the callback function - options.onAfterSlide(currentSlide, $children.length, $children.eq(currentSlide)); - }); - }else if(options.mode == 'fade'){ - setChildrenFade(); - } - // make the current slide active - if(options.moveSlideQty > 1){ - makeSlideActive(Math.ceil(currentSlide / options.moveSlideQty)); - }else{ - makeSlideActive(currentSlide); - } - // display the caption - showCaptions(); - } // end if(!isWorking) - - } - } // end function - - /** - * Go to previous slide - */ - this.goToPreviousSlide = function(stopAuto){ - // check if stopAuto argument is supplied - if(typeof(stopAuto) == 'undefined'){ - var stopAuto = true; - } - if(stopAuto){ - // if show is auto playing, stop it - if(options.auto){ - base.stopShow(true); - } - } - // makes slideshow finite - if(!options.infiniteLoop){ - if(!isWorking){ - var slideLoop = false; - // make current slide the old value plus moveSlideQty - currentSlide = currentSlide - options.moveSlideQty; - // if current slide has looped on itself - if(currentSlide < 0){ - currentSlide = 0; - // if specified, hide the control on the last slide - if(options.hideControlOnEnd){ - $('.bx-prev', $outerWrapper).hide(); - } - } - checkEndControls(); - // next slide callback - options.onPrevSlide(currentSlide, $children.length, $children.eq(currentSlide)); - // move to appropriate slide - base.goToSlide(currentSlide); - } - }else{ - if(!isWorking){ - isWorking = true; - var slideLoop = false; - // make current slide the old value plus moveSlideQty - currentSlide = (currentSlide - (options.moveSlideQty)); - // if current slide has looped on itself - if(currentSlide < 0){ - negativeOffset = (currentSlide % $children.length); - if(negativeOffset == 0){ - currentSlide = 0; - }else{ - currentSlide = ($children.length) + negativeOffset; - } - slideLoop = true; - } - // next slide callback - options.onPrevSlide(currentSlide, $children.length, $children.eq(currentSlide)); - // slide before callback - options.onBeforeSlide(currentSlide, $children.length, $children.eq(currentSlide)); - if(options.mode == 'horizontal'){ - // get the new 'left' property for $parent - var parentLeft = (options.moveSlideQty * childrenOuterWidth); - // animate to the new 'left' - $parent.animate({'left': '+='+parentLeft+'px'}, options.speed, options.easing, function(){ - isWorking = false; - // if its time to loop, reset the $parent - if(slideLoop){ - $parent.css('left', '-'+getSlidePosition(currentSlide, 'left')+'px'); - } - // perform the callback function - options.onAfterSlide(currentSlide, $children.length, $children.eq(currentSlide)); - }); - }else if(options.mode == 'vertical'){ - // get the new 'left' property for $parent - var parentTop = (options.moveSlideQty * childrenMaxHeight); - // animate to the new 'left' - $parent.animate({'top': '+='+parentTop+'px'}, options.speed, options.easing, function(){ - isWorking = false; - // if its time to loop, reset the $parent - if(slideLoop){ - $parent.css('top', '-'+getSlidePosition(currentSlide, 'top')+'px'); - } - // perform the callback function - options.onAfterSlide(currentSlide, $children.length, $children.eq(currentSlide)); - }); - }else if(options.mode == 'fade'){ - setChildrenFade(); - } - // make the current slide active - if(options.moveSlideQty > 1){ - makeSlideActive(Math.ceil(currentSlide / options.moveSlideQty)); - }else{ - makeSlideActive(currentSlide); - } - // display the caption - showCaptions(); - } // end if(!isWorking) - } - } // end function - - /** - * Go to first slide - */ - this.goToFirstSlide = function(stopAuto){ - // check if stopAuto argument is supplied - if(typeof(stopAuto) == 'undefined'){ - var stopAuto = true; - } - base.goToSlide(firstSlide, stopAuto); - } - - /** - * Go to last slide - */ - this.goToLastSlide = function(){ - // check if stopAuto argument is supplied - if(typeof(stopAuto) == 'undefined'){ - var stopAuto = true; - } - base.goToSlide(lastSlide, stopAuto); - } - - /** - * Get the current slide - */ - this.getCurrentSlide = function(){ - return currentSlide; - } - - /** - * Get the total slide count - */ - this.getSlideCount = function(){ - return $children.length; - } - - /** - * Stop the slideshow - */ - this.stopShow = function(changeText){ - clearInterval(interval); - // check if changeText argument is supplied - if(typeof(changeText) == 'undefined'){ - var changeText = true; - } - if(changeText && options.autoControls){ - $autoControls.html($startContent).removeClass('stop').addClass('start'); - autoPlaying = false; - } - } - - /** - * Start the slideshow - */ - this.startShow = function(changeText){ - // check if changeText argument is supplied - if(typeof(changeText) == 'undefined'){ - var changeText = true; - } - setAutoInterval(); - if(changeText && options.autoControls){ - $autoControls.html($stopContent).removeClass('start').addClass('stop'); - autoPlaying = true; - } - } - - /** - * Stops the ticker - */ - this.stopTicker = function(changeText){ - $parent.stop(); - // check if changeText argument is supplied - if(typeof(changeText) == 'undefined'){ - var changeText = true; - } - if(changeText && options.ticker){ - $autoControls.html($startContent).removeClass('stop').addClass('start'); - autoPlaying = false; - } - } - - /** - * Starts the ticker - */ - this.startTicker = function(changeText){ - if(options.mode == 'horizontal'){ - if(options.tickerDirection == 'next'){ - // get the 'left' property where the ticker stopped - var stoppedLeft = parseInt($parent.css('left')); - // calculate the remaining distance the show must travel until the loop - var remainingDistance = (origShowWidth + stoppedLeft) + $children.eq(0).width(); - }else if(options.tickerDirection == 'prev'){ - // get the 'left' property where the ticker stopped - var stoppedLeft = -parseInt($parent.css('left')); - // calculate the remaining distance the show must travel until the loop - var remainingDistance = (stoppedLeft) - $children.eq(0).width(); - } - // calculate the speed ratio to seamlessly finish the loop - var finishingSpeed = (remainingDistance * options.tickerSpeed) / origShowWidth; - // call the show - moveTheShow(tickerLeft, remainingDistance, finishingSpeed); - }else if(options.mode == 'vertical'){ - if(options.tickerDirection == 'next'){ - // get the 'top' property where the ticker stopped - var stoppedTop = parseInt($parent.css('top')); - // calculate the remaining distance the show must travel until the loop - var remainingDistance = (origShowHeight + stoppedTop) + $children.eq(0).height(); - }else if(options.tickerDirection == 'prev'){ - // get the 'left' property where the ticker stopped - var stoppedTop = -parseInt($parent.css('top')); - // calculate the remaining distance the show must travel until the loop - var remainingDistance = (stoppedTop) - $children.eq(0).height(); - } - // calculate the speed ratio to seamlessly finish the loop - var finishingSpeed = (remainingDistance * options.tickerSpeed) / origShowHeight; - // call the show - moveTheShow(tickerTop, remainingDistance, finishingSpeed); - // check if changeText argument is supplied - if(typeof(changeText) == 'undefined'){ - var changeText = true; - } - if(changeText && options.ticker){ - $autoControls.html($stopContent).removeClass('start').addClass('stop'); - autoPlaying = true; - } - } - } - - /** - * Initialize a new slideshow - */ - this.initShow = function(){ - - // reinitialize all variables - // base = this; - $parent = $(this); - $origElement = $parent.clone(); - $children = $parent.children(); - $outerWrapper = ''; - $firstChild = $parent.children(':first'); - childrenWidth = $firstChild.width(); - childrenMaxWidth = 0; - childrenOuterWidth = $firstChild.outerWidth(); - childrenMaxHeight = 0; - wrapperWidth = getWrapperWidth(); - wrapperHeight = getWrapperHeight(); - isWorking = false; - $pager = ''; - currentSlide = 0; - origLeft = 0; - origTop = 0; - interval = ''; - $autoControls = ''; - $stopHtml = ''; - $startContent = ''; - $stopContent = ''; - autoPlaying = true; - loaded = false; - origShowWidth = 0; - origShowHeight = 0; - tickerLeft = 0; - tickerTop = 0; - - firstSlide = 0; - lastSlide = $children.length - 1; - - // get the largest child's height and width - $children.each(function(index) { - if($(this).outerHeight() > childrenMaxHeight){ - childrenMaxHeight = $(this).outerHeight(); - } - if($(this).outerWidth() > childrenMaxWidth){ - childrenMaxWidth = $(this).outerWidth(); - } - }); - - // get random slide number - if(options.randomStart){ - var randomNumber = Math.floor(Math.random() * $children.length); - currentSlide = randomNumber; - origLeft = childrenOuterWidth * (options.moveSlideQty + randomNumber); - origTop = childrenMaxHeight * (options.moveSlideQty + randomNumber); - // start show at specific slide - }else{ - currentSlide = options.startingSlide; - origLeft = childrenOuterWidth * (options.moveSlideQty + options.startingSlide); - origTop = childrenMaxHeight * (options.moveSlideQty + options.startingSlide); - } - - // set initial css - initCss(); - - // check to show pager - if(options.pager && !options.ticker){ - if(options.pagerType == 'full'){ - showPager('full'); - }else if(options.pagerType == 'short'){ - showPager('short'); - } - } - - // check to show controls - if(options.controls && !options.ticker){ - setControlsVars(); - } - - // check if auto - if(options.auto || options.ticker){ - // check if auto controls are displayed - if(options.autoControls){ - setAutoControlsVars(); - } - // check if show should auto start - if(options.autoStart){ - // check if autostart should delay - setTimeout(function(){ - base.startShow(true); - }, options.autoDelay); - }else{ - base.stopShow(true); - } - // check if show should pause on hover - if(options.autoHover && !options.ticker){ - setAutoHover(); - } - } - // make the starting slide active - if(options.moveSlideQty > 1){ - makeSlideActive(Math.ceil(currentSlide / options.moveSlideQty)); - }else{ - makeSlideActive(currentSlide); - } - // check for finite show and if controls should be hidden - checkEndControls(); - // show captions - if(options.captions){ - showCaptions(); - } - // perform the callback function - options.onAfterSlide(currentSlide, $children.length, $children.eq(currentSlide)); - } - - /** - * Destroy the current slideshow - */ - this.destroyShow = function(){ - // stop the auto show - clearInterval(interval); - // remove any controls / pagers that have been appended - $('.bx-next, .bx-prev, .bx-pager, .bx-auto', $outerWrapper).remove(); - // unwrap all bx-wrappers - $parent.unwrap().unwrap().removeAttr('style'); - // remove any styles that were appended - $parent.children().removeAttr('style').not('.bx-child').remove(); - // remove any childrent that were appended - $children.removeClass('bx-child'); - - } - - /** - * Reload the current slideshow - */ - this.reloadShow = function(){ - base.destroyShow(); - base.initShow(); - } - - // PRIVATE FUNCTIONS - - /** - * Creates all neccessary styling for the slideshow - */ - function initCss(){ - // layout the children - setChildrenLayout(options.startingSlide); - // CSS for horizontal mode - if(options.mode == 'horizontal'){ - // wrap the <ul> in div that acts as a window and make the <ul> uber wide - $parent - .wrap('<div class="'+options.wrapperClass+'" style="width:'+wrapperWidth+'px; position:relative;"></div>') - .wrap('<div class="bx-window" style="position:relative; overflow:hidden; width:'+wrapperWidth+'px;"></div>') - .css({ - width: '999999px', - position: 'relative', - left: '-'+(origLeft)+'px' - }); - $parent.children().css({ - width: childrenWidth, - 'float': 'left', - listStyle: 'none' - }); - $outerWrapper = $parent.parent().parent(); - $children.addClass('bx-child'); - // CSS for vertical mode - }else if(options.mode == 'vertical'){ - // wrap the <ul> in div that acts as a window and make the <ul> uber tall - $parent - .wrap('<div class="'+options.wrapperClass+'" style="width:'+childrenMaxWidth+'px; position:relative;"></div>') - .wrap('<div class="bx-window" style="width:'+childrenMaxWidth+'px; height:'+wrapperHeight+'px; position:relative; overflow:hidden;"></div>') - .css({ - height: '999999px', - position: 'relative', - top: '-'+(origTop)+'px' - }); - $parent.children().css({ - listStyle: 'none', - height: childrenMaxHeight - }); - $outerWrapper = $parent.parent().parent(); - $children.addClass('bx-child'); - // CSS for fade mode - }else if(options.mode == 'fade'){ - // wrap the <ul> in div that acts as a window - $parent - .wrap('<div class="'+options.wrapperClass+'" style="width:'+childrenMaxWidth+'px; position:relative;"></div>') - .wrap('<div class="bx-window" style="height:'+childrenMaxHeight+'px; width:'+childrenMaxWidth+'px; position:relative; overflow:hidden;"></div>'); - $parent.children().css({ - listStyle: 'none', - position: 'absolute', - top: 0, - left: 0, - zIndex: 98 - }); - $outerWrapper = $parent.parent().parent(); - $children.not(':eq('+currentSlide+')').fadeTo(0, 0); - $children.eq(currentSlide).css('zIndex', 99); - } - // if captions = true setup a div placeholder - if(options.captions && options.captionsSelector == null){ - $outerWrapper.append('<div class="bx-captions"></div>'); - } - } - - /** - * Depending on mode, lays out children in the proper setup - */ - function setChildrenLayout(){ - // lays out children for horizontal or vertical modes - if(options.mode == 'horizontal' || options.mode == 'vertical'){ - - // get the children behind - var $prependedChildren = getArraySample($children, 0, options.moveSlideQty, 'backward'); - - // add each prepended child to the back of the original element - $.each($prependedChildren, function(index) { - $parent.prepend($(this)); - }); - - // total number of slides to be hidden after the window - var totalNumberAfterWindow = ($children.length + options.moveSlideQty) - 1; - // number of original slides hidden after the window - var pagerExcess = $children.length - options.displaySlideQty; - // number of slides to append to the original hidden slides - var numberToAppend = totalNumberAfterWindow - pagerExcess; - // get the sample of extra slides to append - var $appendedChildren = getArraySample($children, 0, numberToAppend, 'forward'); - - if(options.infiniteLoop){ - // add each appended child to the front of the original element - $.each($appendedChildren, function(index) { - $parent.append($(this)); - }); - } - } - } - - /** - * Sets all variables associated with the controls - */ - function setControlsVars(){ - // check if text or images should be used for controls - // check "next" - if(options.nextImage != ''){ - nextContent = options.nextImage; - nextType = 'image'; - }else{ - nextContent = options.nextText; - nextType = 'text'; - } - // check "prev" - if(options.prevImage != ''){ - prevContent = options.prevImage; - prevType = 'image'; - }else{ - prevContent = options.prevText; - prevType = 'text'; - } - // show the controls - showControls(nextType, nextContent, prevType, prevContent); - } - - /** - * Puts slideshow into auto mode - * - * @param int pause number of ms the slideshow will wait between slides - * @param string direction 'forward', 'backward' sets the direction of the slideshow (forward/backward) - * @param bool controls determines if start/stop controls will be displayed - */ - function setAutoInterval(){ - if(options.auto){ - // finite loop - if(!options.infiniteLoop){ - if(options.autoDirection == 'next'){ - interval = setInterval(function(){ - currentSlide += options.moveSlideQty; - // if currentSlide has exceeded total number - if(currentSlide > lastSlide){ - currentSlide = currentSlide % $children.length; - } - base.goToSlide(currentSlide, false); - }, options.pause); - }else if(options.autoDirection == 'prev'){ - interval = setInterval(function(){ - currentSlide -= options.moveSlideQty; - // if currentSlide is smaller than zero - if(currentSlide < 0){ - negativeOffset = (currentSlide % $children.length); - if(negativeOffset == 0){ - currentSlide = 0; - }else{ - currentSlide = ($children.length) + negativeOffset; - } - } - base.goToSlide(currentSlide, false); - }, options.pause); - } - // infinite loop - }else{ - if(options.autoDirection == 'next'){ - interval = setInterval(function(){ - base.goToNextSlide(false); - }, options.pause); - }else if(options.autoDirection == 'prev'){ - interval = setInterval(function(){ - base.goToPreviousSlide(false); - }, options.pause); - } - } - - }else if(options.ticker){ - - options.tickerSpeed *= 10; - - // get the total width of the original show - $('.bx-child', $outerWrapper).each(function(index) { - origShowWidth += $(this).width(); - origShowHeight += $(this).height(); - }); - - // if prev start the show from the last slide - if(options.tickerDirection == 'prev' && options.mode == 'horizontal'){ - $parent.css('left', '-'+(origShowWidth+origLeft)+'px'); - }else if(options.tickerDirection == 'prev' && options.mode == 'vertical'){ - $parent.css('top', '-'+(origShowHeight+origTop)+'px'); - } - - if(options.mode == 'horizontal'){ - // get the starting left position - tickerLeft = parseInt($parent.css('left')); - // start the ticker - moveTheShow(tickerLeft, origShowWidth, options.tickerSpeed); - }else if(options.mode == 'vertical'){ - // get the starting top position - tickerTop = parseInt($parent.css('top')); - // start the ticker - moveTheShow(tickerTop, origShowHeight, options.tickerSpeed); - } - - // check it tickerHover applies - if(options.tickerHover){ - setTickerHover(); - } - } - } - - function moveTheShow(leftCss, distance, speed){ - // if horizontal - if(options.mode == 'horizontal'){ - // if next - if(options.tickerDirection == 'next'){ - $parent.animate({'left': '-='+distance+'px'}, speed, 'linear', function(){ - $parent.css('left', leftCss); - moveTheShow(leftCss, origShowWidth, options.tickerSpeed); - }); - // if prev - }else if(options.tickerDirection == 'prev'){ - $parent.animate({'left': '+='+distance+'px'}, speed, 'linear', function(){ - $parent.css('left', leftCss); - moveTheShow(leftCss, origShowWidth, options.tickerSpeed); - }); - } - // if vertical - }else if(options.mode == 'vertical'){ - // if next - if(options.tickerDirection == 'next'){ - $parent.animate({'top': '-='+distance+'px'}, speed, 'linear', function(){ - $parent.css('top', leftCss); - moveTheShow(leftCss, origShowHeight, options.tickerSpeed); - }); - // if prev - }else if(options.tickerDirection == 'prev'){ - $parent.animate({'top': '+='+distance+'px'}, speed, 'linear', function(){ - $parent.css('top', leftCss); - moveTheShow(leftCss, origShowHeight, options.tickerSpeed); - }); - } - } - } - - /** - * Sets all variables associated with the controls - */ - function setAutoControlsVars(){ - // check if text or images should be used for controls - // check "start" - if(options.startImage != ''){ - startContent = options.startImage; - startType = 'image'; - }else{ - startContent = options.startText; - startType = 'text'; - } - // check "stop" - if(options.stopImage != ''){ - stopContent = options.stopImage; - stopType = 'image'; - }else{ - stopContent = options.stopText; - stopType = 'text'; - } - // show the controls - showAutoControls(startType, startContent, stopType, stopContent); - } - - /** - * Handles hover events for auto shows - */ - function setAutoHover(){ - // hover over the slider window - $outerWrapper.find('.bx-window').hover(function() { - if(autoPlaying){ - base.stopShow(false); - } - }, function() { - if(autoPlaying){ - base.startShow(false); - } - }); - } - - /** - * Handles hover events for ticker mode - */ - function setTickerHover(){ - // on hover stop the animation - $parent.hover(function() { - if(autoPlaying){ - base.stopTicker(false); - } - }, function() { - if(autoPlaying){ - base.startTicker(false); - } - }); - } - - /** - * Handles fade animation - */ - function setChildrenFade(){ - // fade out any other child besides the current - $children.not(':eq('+currentSlide+')').fadeTo(options.speed, 0).css('zIndex', 98); - // fade in the current slide - $children.eq(currentSlide).css('zIndex', 99).fadeTo(options.speed, 1, function(){ - isWorking = false; - // ie fade fix - if(jQuery.browser.msie){ - $children.eq(currentSlide).get(0).style.removeAttribute('filter'); - } - // perform the callback function - options.onAfterSlide(currentSlide, $children.length, $children.eq(currentSlide)); - }); - }; - - /** - * Makes slide active - */ - function makeSlideActive(number){ - if(options.pagerType == 'full' && options.pager){ - // remove all active classes - $('a', $pager).removeClass(options.pagerActiveClass); - // assign active class to appropriate slide - $('a', $pager).eq(number).addClass(options.pagerActiveClass); - }else if(options.pagerType == 'short' && options.pager){ - $('.bx-pager-current', $pager).html(currentSlide+1); - } - } - - /** - * Displays next/prev controls - * - * @param string nextType 'image', 'text' - * @param string nextContent if type='image', specify a filepath to the image. if type='text', specify text. - * @param string prevType 'image', 'text' - * @param string prevContent if type='image', specify a filepath to the image. if type='text', specify text. - */ - function showControls(nextType, nextContent, prevType, prevContent){ - // create pager html elements - var $nextHtml = $('<a href="" class="bx-next"></a>'); - var $prevHtml = $('<a href="" class="bx-prev"></a>'); - // check if next is 'text' or 'image' - if(nextType == 'text'){ - $nextHtml.html(nextContent); - }else{ - $nextHtml.html('<img src="'+nextContent+'" />'); - } - // check if prev is 'text' or 'image' - if(prevType == 'text'){ - $prevHtml.html(prevContent); - }else{ - $prevHtml.html('<img src="'+prevContent+'" />'); - } - // check if user supplied a selector to populate next control - if(options.prevSelector){ - $(options.prevSelector).append($prevHtml); - }else{ - $outerWrapper.append($prevHtml); - } - // check if user supplied a selector to populate next control - if(options.nextSelector){ - $(options.nextSelector).append($nextHtml); - }else{ - $outerWrapper.append($nextHtml); - } - // click next control - $nextHtml.click(function() { - base.goToNextSlide(); - return false; - }); - // click prev control - $prevHtml.click(function() { - base.goToPreviousSlide(); - return false; - }); - } - - /** - * Displays the pager - * - * @param string type 'full', 'short' - */ - function showPager(type){ - // sets up logic for finite multi slide shows - var pagerQty = $children.length; - // if we are moving more than one at a time and we have a finite loop - if(options.moveSlideQty > 1){ - // if slides create an odd number of pages - if($children.length % options.moveSlideQty != 0){ - // pagerQty = $children.length / options.moveSlideQty + 1; - pagerQty = Math.ceil($children.length / options.moveSlideQty); - // if slides create an even number of pages - }else{ - pagerQty = $children.length / options.moveSlideQty; - } - } - var pagerString = ''; - // check if custom build function was supplied - if(options.buildPager){ - for(var i=0; i<pagerQty; i++){ - pagerString += options.buildPager(i, $children.eq(i * options.moveSlideQty)); - } - - // if not, use default pager - }else if(type == 'full'){ - // build the full pager - for(var i=1; i<=pagerQty; i++){ - pagerString += '<a href="" class="pager-link pager-'+i+'">'+i+'</a>'; - } - }else if(type == 'short') { - // build the short pager - pagerString = '<span class="bx-pager-current">'+(options.startingSlide+1)+'</span> '+options.pagerShortSeparator+' <span class="bx-pager-total">'+$children.length+'</span>'; - } - // check if user supplied a pager selector - if(options.pagerSelector){ - $(options.pagerSelector).append(pagerString); - $pager = $(options.pagerSelector); - }else{ - var $pagerContainer = $('<div class="bx-pager"></div>'); - $pagerContainer.append(pagerString); - // attach the pager to the DOM - if(options.pagerLocation == 'top'){ - $outerWrapper.prepend($pagerContainer); - }else if(options.pagerLocation == 'bottom'){ - $outerWrapper.append($pagerContainer); - } - // cache the pager element - $pager = $('.bx-pager', $outerWrapper); - } - $pager.children().click(function() { - // only if pager is full mode - if(options.pagerType == 'full'){ - // get the index from the link - var slideIndex = $pager.children().index(this); - // accomodate moving more than one slide - if(options.moveSlideQty > 1){ - slideIndex *= options.moveSlideQty; - } - base.goToSlide(slideIndex); - } - return false; - }); - } - - /** - * Displays captions - */ - function showCaptions(){ - // get the title from each image - var caption = $('img', $children.eq(currentSlide)).attr('title'); - // if the caption exists - if(caption != ''){ - // if user supplied a selector - if(options.captionsSelector){ - $(options.captionsSelector).html(caption); - }else{ - $('.bx-captions', $outerWrapper).html(caption); - } - }else{ - // if user supplied a selector - if(options.captionsSelector){ - $(options.captionsSelector).html(' '); - }else{ - $('.bx-captions', $outerWrapper).html(' '); - } - } - } - - /** - * Displays start/stop controls for auto and ticker mode - * - * @param string type 'image', 'text' - * @param string next [optional] if type='image', specify a filepath to the image. if type='text', specify text. - * @param string prev [optional] if type='image', specify a filepath to the image. if type='text', specify text. - */ - function showAutoControls(startType, startContent, stopType, stopContent){ - // create pager html elements - $autoControls = $('<a href="" class="bx-start"></a>'); - // check if start is 'text' or 'image' - if(startType == 'text'){ - $startContent = startContent; - }else{ - $startContent = '<img src="'+startContent+'" />'; - } - // check if stop is 'text' or 'image' - if(stopType == 'text'){ - $stopContent = stopContent; - }else{ - $stopContent = '<img src="'+stopContent+'" />'; - } - // check if user supplied a selector to populate next control - if(options.autoControlsSelector){ - $(options.autoControlsSelector).append($autoControls); - }else{ - $outerWrapper.append('<div class="bx-auto"></div>'); - $('.bx-auto', $outerWrapper).html($autoControls); - } - - // click start control - $autoControls.click(function() { - if(options.ticker){ - if($(this).hasClass('stop')){ - base.stopTicker(); - }else if($(this).hasClass('start')){ - base.startTicker(); - } - }else{ - if($(this).hasClass('stop')){ - base.stopShow(true); - }else if($(this).hasClass('start')){ - base.startShow(true); - } - } - return false; - }); - - } - - /** - * Checks if show is in finite mode, and if slide is either first or last, then hides the respective control - */ - function checkEndControls(){ - //alert('currentSlide: '+currentSlide+" firstSlide: "+firstSlide+" lastSlide"+lastSlide); - //alert(options.infiniteLoop); - //alert(options.hideControlOnEnd); - if(!options.infiniteLoop && options.hideControlOnEnd){ - // check previous - //alert('currentSlide: '+currentSlide+" firstSlide: "+firstSlide+" lastSlide"+lastSlide); - if(currentSlide == firstSlide){ - $('.bx-prev', $outerWrapper).hide(); - }else{ - $('.bx-prev', $outerWrapper).show(); - } - // check next - if(currentSlide == lastSlide || - currentSlide + options.moveSlideQty > lastSlide){ - $('.bx-next', $outerWrapper).hide(); - }else{ - $('.bx-next', $outerWrapper).show(); - } - } - } - - /** - * Returns the left offset of the slide from the parent container - */ - function getSlidePosition(number, side){ - if(side == 'left'){ - var position = $('.bx-child', $outerWrapper).eq(number).position().left; - }else if(side == 'top'){ - var position = $('.bx-child', $outerWrapper).eq(number).position().top; - } - return position; - } - - /** - * Returns the width of the wrapper - */ - function getWrapperWidth(){ - var wrapperWidth = $firstChild.outerWidth() * options.displaySlideQty; - return wrapperWidth; - } - - /** - * Returns the height of the wrapper - */ - function getWrapperHeight(){ - // if displaying multiple slides, multiple wrapper width by number of slides to display - var wrapperHeight = $firstChild.outerHeight() * options.displaySlideQty; - return wrapperHeight; - } - - /** - * Returns a sample of an arry and loops back on itself if the end of the array is reached - * - * @param array array original array the sample is derived from - * @param int start array index sample will start - * @param int length number of items in the sample - * @param string direction 'forward', 'backward' direction the loop should travel in the array - */ - function getArraySample(array, start, length, direction){ - // initialize empty array - var sample = []; - // clone the length argument - var loopLength = length; - // determines when the empty array should start being populated - var startPopulatingArray = false; - // reverse the array if direction = 'backward' - if(direction == 'backward'){ - array = $.makeArray(array); - array.reverse(); - } - // loop through original array until the length argument is met - while(loopLength > 0){ - // loop through original array - $.each(array, function(index, val) { - // check if length has been met - if(loopLength > 0){ - // don't do anything unless first index has been reached - if(!startPopulatingArray){ - // start populating empty array - if(index == start){ - startPopulatingArray = true; - // add element to array - sample.push($(this).clone()); - // decrease the length clone variable - loopLength--; - } - }else{ - // add element to array - sample.push($(this).clone()); - // decrease the length clone variable - loopLength--; - } - // if length has been met, break loose - }else{ - return false; - } - }); - } - return sample; - } - - this.each(function(){ - // make sure the element has children - if($(this).children().length > 0){ - base.initShow(); - } - }); - - return this; - } - - jQuery.fx.prototype.cur = function(){ - if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) { - return this.elem[ this.prop ]; - } - - var r = parseFloat( jQuery.css( this.elem, this.prop ) ); - // return r && r > -10000 ? r : 0; - return r; - } - - -})(jQuery); - Deleted: trunk/src/jquery.bxSlider.min.js =================================================================== --- trunk/src/jquery.bxSlider.min.js 2012-10-31 16:41:06 UTC (rev 529) +++ trunk/src/jquery.bxSlider.min.js 2012-10-31 16:50:13 UTC (rev 530) @@ -1,12 +0,0 @@ -/** - * jQuery bxSlider v3.0 - * http://bxslider.com - * - * Copyright 2010, Steven Wanderski - * http://bxcreative.com - * - * Free to use and abuse under the MIT license. - * http://www.opensource.org/licenses/mit-license.php - * - */ -(function(a){a.fn.bxSlider=function(b){function Z(b,c,d,e){var f=[];var g=d;var h=false;if(e=="backward"){b=a.makeArray(b);b.reverse()}while(g>0){a.each(b,function(b,d){if(g>0){if(!h){if(b==c){h=true;f.push(a(this).clone());g--}}else{f.push(a(this).clone());g--}}else{return false}})}return f}function Y(){var a=i.outerHeight()*b.displaySlideQty;return a}function X(){var a=i.outerWidth()*b.displaySlideQty;return a}function W(b,c){if(c=="left"){var d=a(".pager",h).eq(b).position().left}else if(c=="top"){var d=a(".pager",h).eq(b).position().top}return d}function V(){if(!b.infiniteLoop&&b.hideControlOnEnd){if(x==F){a(".bx-prev",h).hide()}else{a(".bx-prev",h).show()}if(x==G){a(".bx-next",h).hide()}else{a(".bx-next",h).show()}}}function U(c,e,f,g){p=a('<a href="" class="bx-start"></a>');if(c=="text"){r=e}else{r='<img src="'+e+'" />'}if(f=="text"){s=g}else{s='<img src="'+g+'" />'}if(b.autoControlsSelector){a(b.autoControlsSelector).append(p)}else{h.append('<div class="bx-auto"></div>');a(".bx-auto",h).html(p)}p.click(function(){if(b.ticker){if(a(this).hasClass("stop")){d.stopTicker()}else if(a(this).hasClass("start")){d.startTicker()}}else{if(a(this).hasClass("stop")){d.stopShow(true)}else if(a(this).hasClass("start")){d.startShow(true)}}return false})}function T(){var c=a("img",g.eq(x)).attr("title");if(c!=""){if(b.captionsSelector){a(b.captionsSelector).html(c)}else{a(".bx-captions",h).html(c)}}else{if(b.captionsSelector){a(b.captionsSelector).html(" ")}else{a(".bx-captions",h).html(" ")}}}function S(c){var e=g.length;if(b.moveSlideQty>1){if(g.length%b.moveSlideQty!=0){e=Math.ceil(g.length/b.moveSlideQty)}else{e=g.length/b.moveSlideQty}}var f="";if(b.buildPager){for(var i=0;i<e;i++){f+=b.buildPager(i,g.eq(i*b.moveSlideQty))}}else if(c=="full"){for(var i=1;i<=e;i++){f+='<a href="" class="pager-link pager-'+i+'">'+i+"</a>"}}else if(c=="short"){f='<span class="bx-pager-current">'+(b.startingSlide+1)+"</span> "+b.pagerShortSeparator+' <span class="bx-pager-total">'+g.length+"</span>"}if(b.pagerSelector){a(b.pagerSelector).append(f);n=a(b.pagerSelector)}else{var j=a('<div class="bx-pager"></div>');j.append(f);if(b.pagerLocation=="top"){h.prepend(j)}else if(b.pagerLocation=="bottom"){h.append(j)}n=a(".bx-pager",h)}n.children().click(function(){if(b.pagerType=="full"){var a=n.children().index(this);if(b.moveSlideQty>1){a*=b.moveSlideQty}d.goToSlide(a)}return false})}function R(c,e,f,g){var i=a('<a href="" class="bx-next"></a>');var j=a('<a href="" class="bx-prev"></a>');if(c=="text"){i.html(e)}else{i.html('<img src="'+e+'" />')}if(f=="text"){j.html(g)}else{j.html('<img src="'+g+'" />')}if(b.prevSelector){a(b.prevSelector).append(j)}else{h.append(j)}if(b.nextSelector){a(b.nextSelector).append(i)}else{h.append(i)}i.click(function(){d.goToNextSlide();return false});j.click(function(){d.goToPreviousSlide();return false})}function Q(c){if(b.pagerType=="full"&&b.pager){a("a",n).removeClass(b.pagerActiveClass);a("a",n).eq(c).addClass(b.pagerActiveClass)}else if(b.pagerType=="short"&&b.pager){a(".bx-pager-current",n).html(x+1)}}function P(){g.not(":eq("+x+")").fadeTo(b.speed,0).css("zIndex",98);g.eq(x).css("zIndex",99).fadeTo(b.speed,1,function(){E=false;if(jQuery.browser.msie){g.eq(x).get(0).style.removeAttribute("filter")}b.onAfterSlide(x,g.length,g.eq(x))})}function O(){e.hover(function(){if(t){d.stopTicker(false)}},function(){if(t){d.startTicker(false)}})}function N(){h.find(".bx-window").hover(function(){if(t){d.stopShow(false)}},function(){if(t){d.startShow(false)}})}function M(){if(b.startImage!=""){startContent=b.startImage;startType="image"}else{startContent=b.startText;startType="text"}if(b.stopImage!=""){stopContent=b.stopImage;stopType="image"}else{stopContent=b.stopText;stopType="text"}U(startType,startContent,stopType,stopContent)}function L(a,c,d){if(b.mode=="horizontal"){if(b.tickerDirection=="next"){e.animate({left:"-="+c+"px"},d,"linear",function(){e.css("left",a);L(a,A,b.tickerSpeed)})}else if(b.tickerDirection=="prev"){e.animate({left:"+="+c+"px"},d,"linear",function(){e.css("left",a);L(a,A,b.tickerSpeed)})}}else if(b.mode=="vertical"){if(b.tickerDirection=="next"){e.animate({top:"-="+c+"px"},d,"linear",function(){e.css("top",a);L(a,B,b.tickerSpeed)})}else if(b.tickerDirection=="prev"){e.animate({top:"+="+c+"px"},d,"linear",function(){e.css("top",a);L(a,B,b.tickerSpeed)})}}}function K(){if(b.auto){if(!b.infiniteLoop){if(b.autoDirection=="next"){o=setInterval(function(){x+=b.moveSlideQty;if(x>G){x=x%g.length}d.goToSlide(x,false)},b.pause)}else if(b.autoDirection=="prev"){o=setInterval(function(){x-=b.moveSlideQty;if(x<0){negativeOffset=x%g.length;if(negativeOffset==0){x=0}else{x=g.length+negativeOffset}}d.goToSlide(x,false)},b.pause)}}else{if(b.autoDirection=="next"){o=setInterval(function(){d.goToNextSlide(false)},b.pause)}else if(b.autoDirection=="prev"){o=setInterval(function(){d.goToPreviousSlide(false)},b.pause)}}}else if(b.ticker){b.tickerSpeed*=10;a(".pager",h).each(function(b){A+=a(this).width();B+=a(this).height()});if(b.tickerDirection=="prev"&&b.mode=="horizontal"){e.css("left","-"+(A+y)+"px")}else if(b.tickerDirection=="prev"&&b.mode=="vertical"){e.css("top","-"+(B+z)+"px")}if(b.mode=="horizontal"){C=parseInt(e.css("left"));L(C,A,b.tickerSpeed)}else if(b.mode=="vertical"){D=parseInt(e.css("top"));L(D,B,b.tickerSpeed)}if(b.tickerHover){O()}}}function J(){if(b.nextImage!=""){nextContent=b.nextImage;nextType="image"}else{nextContent=b.nextText;nextType="text"}if(b.prevImage!=""){prevContent=b.prevImage;prevType="image"}else{prevContent=b.prevText;prevType="text"}R(nextType,nextContent,prevType,prevContent)}function I(){if(b.mode=="horizontal"||b.mode=="vertical"){var c=Z(g,0,b.moveSlideQty,"backward");a.each(c,function(b){e.prepend(a(this))});var d=g.length+b.moveSlideQty-1;var f=g.length-b.displaySlideQty;var h=d-f;var i=Z(g,0,h,"forward");if(b.infiniteLoop){a.each(i,function(b){e.append(a(this))})}}}function H(){I(b.startingSlide);if(b.mode=="horizontal"){e.wrap('<div class="'+b.wrapperClass+'" style="width:'+l+'px; position:relative;"></div>').wrap('<div class="bx-window" style="position:relative; overflow:hidden; width:'+l+'px;"></div>').css({width:"999999px",position:"relative",left:"-"+y+"px"});e.children().css({width:j,"float":"left",listStyle:"none"});h=e.parent().parent();g.addClass("pager")}else if(b.mode=="vertical"){e.wrap('<div class="'+b.wrapperClass+'" style="width:'+v+'px; position:relative;"></div>').wrap('<div class="bx-window" style="width:'+v+"px; height:"+m+'px; position:relative; overflow:hidden;"></div>').css({height:"999999px",position:"relative",top:"-"+z+"px"});e.children().css({listStyle:"none",height:w});h=e.parent().parent();g.addClass("pager")}else if(b.mode=="fade"){e.wrap('<div class="'+b.wrapperClass+'" style="width:'+v+'px; position:relative;"></div>').wrap('<div class="bx-window" style="height:'+w+"px; width:"+v+'px; position:relative; overflow:hidden;"></div>');e.children().css({listStyle:"none",position:"absolute",top:0,left:0,zIndex:98});h=e.parent().parent();g.not(":eq("+x+")").fadeTo(0,0);g.eq(x).css("zIndex",99)}if(b.captions&&b.captionsSelector==null){h.append('<div class="bx-captions"></div>')}}var c={mode:"horizontal",infiniteLoop:true,hideControlOnEnd:false,controls:true,speed:500,easing:"swing",pager:false,pagerSelector:null,pagerType:"full",pagerLocation:"bottom",pagerShortSeparator:"/",pagerActiveClass:"pager-active",nextText:"next",nextImage:"",nextSelector:null,prevText:"prev",prevImage:"",prevSelector:null,captions:false,captionsSelector:null,auto:false,autoDirection:"next",autoControls:false,autoControlsSelector:null,autoStart:true,autoHover:false,autoDelay:0,pause:3e3,startText:"start",startImage:"",stopText:"stop",stopImage:"",ticker:false,tickerSpeed:5e3,tickerDirection:"next",tickerHover:false,wrapperClass:"bx-wrapper",startingSlide:0,displaySlideQty:1,moveSlideQty:1,randomStart:false,onBeforeSlide:function(){},onAfterSlide:function(){},onLastSlide:function(){},onFirstSlide:function(){},onNextSlide:function(){},onPrevSlide:function(){},buildPager:null};var b=a.extend(c,b);var d=this;var e="";var f="";var g="";var h="";var i="";var j="";var k="";var l="";var m="";var n="";var o="";var p="";var q="";var r="";var s="";var t=true;var u=false;var v=0;var w=0;var x=0;var y=0;var z=0;var A=0;var B=0;var C=0;var D=0;var E=false;var F=0;var G=g.length-1;this.goToSlide=function(a,c){if(!E){E=true;x=a;b.onBeforeSlide(x,g.length,g.eq(x));if(typeof c=="undefined"){var c=true}if(c){if(b.auto){d.stopShow(true)}}slide=a;if(slide==F){b.onFirstSlide(x,g.length,g.eq(x))}if(slide==G){b.onLastSlide(x,g.length,g.eq(x))}if(b.mode=="horizontal"){e.animate({left:"-"+W(slide,"left")+"px"},b.speed,b.easing,function(){E=false;b.onAfterSlide(x,g.length,g.eq(x))})}else if(b.mode=="vertical"){e.animate({top:"-"+W(slide,"top")+"px"},b.speed,b.easing,function(){E=false;b.onAfterSlide(x,g.length,g.eq(x))})}else if(b.mode=="fade"){P()}V();if(b.moveSlideQty>1){a=Math.floor(a/b.moveSlideQty)}Q(a);T()}};this.goToNextSlide=function(a){if(typeof a=="undefined"){var a=true}if(a){if(b.auto){d.stopShow(true)}}if(!b.infiniteLoop){if(!E){var c=false;x=x+b.moveSlideQty;if(x<=G){V();b.onNextSlide(x,g.length,g.eq(x));d.goToSlide(x)}else{x-=b.moveSlideQty}}}else{if(!E){E=true;var c=false;x=x+b.moveSlideQty;if(x>G){x=x%g.length;c=true}b.onNextSlide(x,g.length,g.eq(x));b.onBeforeSlide(x,g.length,g.eq(x));if(b.mode=="horizontal"){var f=b.moveSlideQty*k;e.animate({left:"-="+f+"px"},b.speed,b.easing,function(){E=false;if(c){e.css("left","-"+W(x,"left")+"px")}b.onAfterSlide(x,g.length,g.eq(x))})}else if(b.mode=="vertical"){var h=b.moveSlideQty*w;e.animate({top:"-="+h+"px"},b.speed,b.easing,function(){E=false;if(c){e.css("top","-"+W(x,"top")+"px")}b.onAfterSlide(x,g.length,g.eq(x))})}else if(b.mode=="fade"){P()}if(b.moveSlideQty>1){Q(Math.ceil(x/b.moveSlideQty))}else{Q(x)}T()}}};this.goToPreviousSlide=function(c){if(typeof c=="undefined"){var c=true}if(c){if(b.auto){d.stopShow(true)}}if(!b.infiniteLoop){if(!E){var f=false;x=x-b.moveSlideQty;if(x<0){x=0;if(b.hideControlOnEnd){a(".bx-prev",h).hide()}}V();b.onPrevSlide(x,g.length,g.eq(x));d.goToSlide(x)}}else{if(!E){E=true;var f=false;x=x-b.moveSlideQty;if(x<0){negativeOffset=x%g.length;if(negativeOffset==0){x=0}else{x=g.length+negativeOffset}f=true}b.onPrevSlide(x,g.length,g.eq(x));b.onBeforeSlide(x,g.length,g.eq(x));if(b.mode=="horizontal"){var i=b.moveSlideQty*k;e.animate({left:"+="+i+"px"},b.speed,b.easing,function(){E=false;if(f){e.css("left","-"+W(x,"left")+"px")}b.onAfterSlide(x,g.length,g.eq(x))})}else if(b.mode=="vertical"){var j=b.moveSlideQty*w;e.animate({top:"+="+j+"px"},b.speed,b.easing,function(){E=false;if(f){e.css("top","-"+W(x,"top")+"px")}b.onAfterSlide(x,g.length,g.eq(x))})}else if(b.mode=="fade"){P()}if(b.moveSlideQty>1){Q(Math.ceil(x/b.moveSlideQty))}else{Q(x)}T()}}};this.goToFirstSlide=function(a){if(typeof a=="undefined"){var a=true}d.goToSlide(F,a)};this.goToLastSlide=function(){if(typeof a=="undefined"){var a=true}d.goToSlide(G,a)};this.getCurrentSlide=function(){return x};this.getSlideCount=function(){return g.length};this.stopShow=function(a){clearInterval(o);if(typeof a=="undefined"){var a=true}if(a&&b.autoControls){p.html(r).removeClass("stop").addClass("start");t=false}};this.startShow=function(a){if(typeof a=="undefined"){var a=true}K();if(a&&b.autoControls){p.html(s).removeClass("start").addClass("stop");t=true}};this.stopTicker=function(a){e.stop();if(typeof a=="undefined"){var a=true}if(a&&b.ticker){p.html(r).removeClass("stop").addClass("start");t=false}};this.startTicker=function(a){if(b.mode=="horizontal"){if(b.tickerDirection=="next"){var c=parseInt(e.css("left"));var d=A+c+g.eq(0).width()}else if(b.tickerDirection=="prev"){var c=-parseInt(e.css("left"));var d=c-g.eq(0).width()}var f=d*b.tickerSpeed/A;L(C,d,f)}else if(b.mode=="vertical"){if(b.tickerDirection=="next"){var h=parseInt(e.css("top"));var d=B+h+g.eq(0).height()}else if(b.tickerDirection=="prev"){var h=-parseInt(e.css("top"));var d=h-g.eq(0).height()}var f=d*b.tickerSpeed/B;L(D,d,f);if(typeof a=="undefined"){var a=true}if(a&&b.ticker){p.html(s).removeClass("start").addClass("stop");t=true}}};this.initShow=function(){e=a(this);f=e.clone();g=e.children();h="";i=e.children(":first");j=i.width();v=0;k=i.outerWidth();w=0;l=X();m=Y();E=false;n="";x=0;y=0;z=0;o="";p="";q="";r="";s="";t=true;u=false;A=0;B=0;C=0;D=0;F=0;G=g.length-1;g.each(function(b){if(a(this).outerHeight()>w){w=a(this).outerHeight()}if(a(this).outerWidth()>v){v=a(this).outerWidth()}});if(b.randomStart){var c=Math.floor(Math.random()*g.length);x=c;y=k*(b.moveSlideQty+c);z=w*(b.moveSlideQty+c)}else{x=b.startingSlide;y=k*(b.moveSlideQty+b.startingSlide);z=w*(b.moveSlideQty+b.startingSlide)}H();if(b.pager&&!b.ticker){if(b.pagerType=="full"){S("full")}else if(b.pagerType=="short"){S("short")}}if(b.controls&&!b.ticker){J()}if(b.auto||b.ticker){if(b.autoControls){M()}if(b.autoStart){setTimeout(function(){d.startShow(true)},b.autoDelay)}else{d.stopShow(true)}if(b.autoHover&&!b.ticker){N()}}if(b.moveSlideQty>1){Q(Math.ceil(x/b.moveSlideQty))}else{Q(x)}V();if(b.captions){T()}b.onAfterSlide(x,g.length,g.eq(x))};this.destroyShow=function(){clearInterval(o);a(".bx-next, .bx-prev, .bx-pager, .bx-auto",h).remove();e.unwrap().unwrap().removeAttr("style");e.children().removeAttr("style").not(".pager").remove();g.removeClass("pager")};this.reloadShow=function(){d.destroyShow();d.initShow()};this.each(function(){if(a(this).children().length>0){d.initShow()}});return this};jQuery.fx.prototype.cur=function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var a=parseFloat(jQuery.css(this.elem,this.prop));return a}})(jQuery) \ No newline at end of file Deleted: trunk/src/jquery.checkbox.css =================================================================== --- trunk/src/jquery.checkbox.css 2012-10-31 16:41:06 UTC (rev 529) +++ trunk/src/jquery.checkbox.css 2012-10-31 16:50:13 UTC (rev 530) @@ -1,25 +0,0 @@ -.jquery-checkbox {display: inline; font-size: 20px; line-height: 20px; cursor: pointer; cursor: hand;float: right;} -.jquery-checkbox .mark {display: inline;} - -.jquery-checkbox img {vertical-align: middle; width: 60px; height: 20px;} -.jquery-checkbox img{background: transparent url(/mc/0.1/images/checkbox.png) no-repeat;} - -.jquery-checkbox img{ - background-position: 0px 0px; -} -.jquery-checkbox-hover img{ - background-position: 0px -20px; -} -.jquery-checkbox-checked img{ - background-position: 0px -40px; -} -.jquery-checkbox-checked .jquery-checkbox-hover img { - background-position: 0px -60px; -} - -.jquery-checkbox-disabled img{ - background-position: 0px -80px; -} -.jquery-checkbox-checked .jquery-checkbox-disabled img{ - background-position: 0px -100px; -} \ No newline at end of file Deleted: trunk/src/jquery.checkbox.min.js =================================================================== --- trunk/src/jquery.checkbox.min.js 2012-10-31 16:41:06 UTC (rev 529) +++ trunk/src/jquery.checkbox.min.js 2012-10-31 16:50:13 UTC (rev 530) @@ -1 +0,0 @@ -(function($){var i=function(e){if(!e)var e=window.event;e.cancelBubble=true;if(e.stopPropagation)e.stopPropagation()};$.fn.checkbox=function(f){try{document.execCommand('BackgroundImageCache',false,true)}catch(e){}var g={cls:'jquery-checkbox',empty:'/mc/0.1/images/empty.png'};g=$.extend(g,f||{});var h=function(a){var b=a.checked;var c=a.disabled;var d=$(a);if(a.stateInterval)clearInterval(a.stateInterval);a.stateInterval=setInterval(function(){if(a.disabled!=c)d.trigger((c=!!a.disabled)?'disable':'enable');if(a.checked!=b)d.trigger((b=!!a.checked)?'check':'uncheck')},10);return d};return this.each(function(){var a=this;var b=h(a);if(a.wrapper)a.wrapper.remove();a.wrapper=$('<span class="'+g.cls+'"><span class="mark"><img src="'+g.empty+'" /></span></span>');a.wrapperInner=a.wrapper.children('span:eq(0)');a.wrapper.hover(function(e){a.wrapperInner.addClass(g.cls+'-hover');i(e)},function(e){a.wrapperInner.removeClass(g.cls+'-hover');i(e)});b.css({position:'absolute',zIndex:-1,visibility:'hidden'}).after(a.wrapper);var c=false;if(b.attr('id')){c=$('label[for='+b.attr('id')+']');if(!c.length)c=false}if(!c){c=b.closest?b.closest('label'):b.parents('label:eq(0)');if(!c.length)c=false}if(c){c.hover(function(e){a.wrapper.trigger('mouseover',[e])},function(e){a.wrapper.trigger('mouseout',[e])});c.click(function(e){b.trigger('click',[e]);i(e);return false})}a.wrapper.click(function(e){b.trigger('click',[e]);i(e);return false});b.click(function(e){i(e)});b.bind('disable',function(){a.wrapperInner.addClass(g.cls+'-disabled')}).bind('enable',function(){a.wrapperInner.removeClass(g.cls+'-disabled')});b.bind('check',function(){a.wrapper.addClass(g.cls+'-checked')}).bind('uncheck',function(){a.wrapper.removeClass(g.cls+'-checked')});$('img',a.wrapper).bind('dragstart',function(){return false}).bind('mousedown',function(){return false});if(window.getSelection)a.wrapper.css('MozUserSelect','none');if(a.checked)a.wrapper.addClass(g.cls+'-checked');if(a.disabled)a.wrapperInner.addClass(g.cls+'-disabled')})}})(jQuery); \ No newline at end of file Deleted: trunk/src/jquery.easySlider.css =================================================================== --- trunk/src/jquery.easySlider.css 2012-10-31 16:41:06 UTC (rev 529) +++ trunk/src/jquery.easySlider.css 2012-10-31 16:50:13 UTC (rev 530) @@ -1,31 +0,0 @@ -#slider{} -#slider ul, #slider li{ - margin:0; - padding:0; - list-style:none; - } -#slider li{ - width:905px; - /*height:241px;*/ - overflow:hidden; - } -#prevBtn, #nextBtn{ - display:block; - width:30px; - height:77px; - position:absolute; - left:-30px; - top:71px; - } -#nextBtn{ - left:696px; - } -#prevBtn a, #nextBtn a{ - display:block; - width:30px; - height:77px; - background:url(/mc/0.1/images/btn_prev.gif) no-repeat 0 0; - } -#nextBtn a{ - background:url(/mc/0.1/images/btn_next.gif) no-repeat 0 0; - } \ No newline at end of file Deleted: trunk/src/jquery.easySlider1.7.js =================================================================== --- trunk/src/jquery.easySlider1.7.js 2012-10-31 16:41:06 UTC (rev 529) +++ trunk/src/jquery.easySlider1.7.js 2012-10-31 16:50:13 UTC (rev 530) @@ -1,175 +0,0 @@ -/* - * Easy Slider 1.5 - jQuery plugin - * written by Alen Grakalic - * http://cssglobe.com/post/4004/easy-slider-15-the-easiest-jquery-plugin-for-… - * - * Copyright (c) 2009 Alen Grakalic (http://cssglobe.com) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * Built for jQuery library - * http://jquery.com - * - */ - -/* - * markup example for $("#slider").easySlider(); - * - * <div id="slider"> - * <ul> - * <li><img src="images/01.jpg" alt="" /></li> - * <li><img src="images/02.jpg" alt="" /></li> - * <li><img src="images/03.jpg" alt="" /></li> - * <li><img src="images/04.jpg" alt="" /></li> - * <li><img src="images/05.jpg" alt="" /></li> - * </ul> - * </div> - * - */ - -(function($) { - - $.fn.easySlider = function(options){ - - // default configuration properties - var defaults = { - prevId: 'prevBtn', - prevText: 'Previous', - nextId: 'nextBtn', - nextText: 'Next', - controlsShow: true, - controlsBefore: '', - controlsAfter: '', - controlsFade: true, - firstId: 'firstBtn', - firstText: 'First', - firstShow: false, - lastId: 'lastBtn', - lastText: 'Last', - lastShow: false, - vertical: false, - speed: 800, - auto: false, - pause: 2000, - continuous: false - }; - - var options = $.extend(defaults, options); - - this.each(function() { - var obj = $(this); - var s = $("li", obj).length; - var w = $("li", obj).width(); - var h = $("li", obj).height(); - obj.width(w); - obj.height(h); - obj.css("overflow","hidden"); - var ts = s-1; - var t = 0; - $("ul", obj).css('width',s*w); - if(!options.vertical) $("li", obj).css('float','left'); - - if(options.controlsShow){ - var html = options.controlsBefore; - if(options.firstShow) html += '<span id="'+ options.firstId +'"><a href=\"javascript:void(0);\">'+ options.firstText +'</a></span>'; - html += ' <span id="'+ options.prevId +'"><a href=\"javascript:void(0);\">'+ options.prevText +'</a></span>'; - html += ' <span id="'+ options.nextId +'"><a href=\"javascript:void(0);\">'+ options.nextText +'</a></span>'; - if(options.lastShow) html += ' <span id="'+ options.lastId +'"><a href=\"javascript:void(0);\">'+ options.lastText +'</a></span>'; - html += options.controlsAfter; - $(obj).after(html); - }; - - $("a","#"+options.nextId).click(function(){ - animate("next",true); - }); - $("a","#"+options.prevId).click(function(){ - animate("prev",true); - }); - $("a","#"+options.firstId).click(function(){ - animate("first",true); - }); - $("a","#"+options.lastId).click(function(){ - animate("last",true); - }); - - function animate(dir,clicked){ - var ot = t; - switch(dir){ - case "next": - t = (ot>=ts) ? (options.continuous ? 0 : ts) : t+1; - break; - case "prev": - t = (t<=0) ? (options.continuous ? ts : 0) : t-1; - break; - case "first": - t = 0; - break; - case "last": - t = ts; - break; - default: - break; - }; - - var diff = Math.abs(ot-t); - var speed = diff*options.speed; - if(!options.vertical) { - p = (t*w*-1); - $("ul",obj).animate( - { marginLeft: p }, - speed - ); - } else { - p = (t*h*-1); - $("ul",obj).animate( - { marginTop: p }, - speed - ); - }; - - if(!options.continuous && options.controlsFade){ - if(t==ts){ - $("a","#"+options.nextId).hide(); - $("a","#"+options.lastId).hide(); - } else { - $("a","#"+options.nextId).show(); - $("a","#"+options.lastId).show(); - }; - if(t==0){ - $("a","#"+options.prevId).hide(); - $("a","#"+options.firstId).hide(); - } else { - $("a","#"+options.prevId).show(); - $("a","#"+options.firstId).show(); - }; - }; - - if(clicked) clearTimeout(timeout); - if(options.auto && dir=="next" && !clicked){; - timeout = setTimeout(function(){ - animate("next",false); - },diff*options.speed+options.pause); - }; - - }; - // init - var timeout; - if(options.auto){; - timeout = setTimeout(function(){ - animate("next",false); - },options.pause); - }; - - if(!options.continuous && options.controlsFade){ - $("a","#"+options.prevId).hide(); - $("a","#"+options.firstId).hide(); - }; - - }); - - }; - -})(jQuery); - - - Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-10-31 16:41:06 UTC (rev 529) +++ trunk/wp-theme/mc2-form.php 2012-10-31 16:50:13 UTC (rev 530) @@ -408,15 +408,8 @@ --> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script> -<script type="text/javascript" src="/mc/0.1/jquery.tagsinput.min.js"></script> <script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js'></script> - +<script type="text/javascript" src="/mc/0.1/jquery.tagsinput.min.js"></script> <script type='text/javascript' src='/mc/0.1/jquery.infieldlabel.min.js'></script> <script type="text/javascript" src="/mc/0.1/jquery.inputfocus-0.9.min.js"></script> <script type="text/javascript" src="/mc/0.1/mc-dia-form2.js"></script> @@ -435,27 +428,14 @@ $j('#infield-other-license-website').inFieldLabels(); //$j('#infield-url').inFieldLabels(); $j('#infield-terms-of-use-website').inFieldLabels(); - /*$j('#np-checkbox').checkbox(); - $j('#rp-checkbox').checkbox(); - $j('#rc-checkbox').checkbox(); - $j('#gr-checkbox').checkbox();*/ $j('.buttonp').button({ icons: {primary:'ui-icon-arrowthick-1-w'} }); $j('.buttonn').button({ icons: {secondary:'ui-icon-arrowthick-1-e'} }); $j( "#step2-radio").buttonset(); $j( "#step3-radio").buttonset(); $j( "#step4-radio").buttonset(); $j( "#step5-radio").buttonset(); - /* - $j('#slider1').bxSlider({startingSlide:0}); - $j('#fifth').remove(); - */ $j("ul.qtrans_language_chooser > li").css("display", "inline"); $j("ul.qtrans_language_chooser").css("margin-top", "-25px"); }); - //$j('div.blockMe1').block({ message: null }); - //$j('div.blockMe2').block({ message: null }); - //$j('div.blockMe3').block({ message: null }); - //$j('div.blockMe4').block({ message: null }); - //$( "#format" ).buttonset(); </script> \ No newline at end of file

1 0

r529 - trunk/src
by Mario Gallegos 31 Oct '12

31 Oct '12

Author: mgallegos Date: 2012-10-31 17:41:06 +0100 (Wed, 31 Oct 2012) New Revision: 529 Removed: trunk/src/jquery.easing.1.3.js Log: Deleted: trunk/src/jquery.easing.1.3.js =================================================================== --- trunk/src/jquery.easing.1.3.js 2012-10-15 19:18:17 UTC (rev 528) +++ trunk/src/jquery.easing.1.3.js 2012-10-31 16:41:06 UTC (rev 529) @@ -1,205 +0,0 @@ -/* - * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/ - * - * Uses the built in easing capabilities added In jQuery 1.1 - * to offer multiple easing options - * - * TERMS OF USE - jQuery Easing - * - * Open source under the BSD License. - * - * Copyright © 2008 George McGinley Smith - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * Neither the name of the author nor the names of contributors may be used to endorse - * or promote products derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * -*/ - -// t: current time, b: begInnIng value, c: change In value, d: duration -jQuery.easing['jswing'] = jQuery.easing['swing']; - -jQuery.extend( jQuery.easing, -{ - def: 'easeOutQuad', - swing: function (x, t, b, c, d) { - //alert(jQuery.easing.default); - return jQuery.easing[jQuery.easing.def](x, t, b, c, d); - }, - easeInQuad: function (x, t, b, c, d) { - return c*(t/=d)*t + b; - }, - easeOutQuad: function (x, t, b, c, d) { - return -c *(t/=d)*(t-2) + b; - }, - easeInOutQuad: function (x, t, b, c, d) { - if ((t/=d/2) < 1) return c/2*t*t + b; - return -c/2 * ((--t)*(t-2) - 1) + b; - }, - easeInCubic: function (x, t, b, c, d) { - return c*(t/=d)*t*t + b; - }, - easeOutCubic: function (x, t, b, c, d) { - return c*((t=t/d-1)*t*t + 1) + b; - }, - easeInOutCubic: function (x, t, b, c, d) { - if ((t/=d/2) < 1) return c/2*t*t*t + b; - return c/2*((t-=2)*t*t + 2) + b; - }, - easeInQuart: function (x, t, b, c, d) { - return c*(t/=d)*t*t*t + b; - }, - easeOutQuart: function (x, t, b, c, d) { - return -c * ((t=t/d-1)*t*t*t - 1) + b; - }, - easeInOutQuart: function (x, t, b, c, d) { - if ((t/=d/2) < 1) return c/2*t*t*t*t + b; - return -c/2 * ((t-=2)*t*t*t - 2) + b; - }, - easeInQuint: function (x, t, b, c, d) { - return c*(t/=d)*t*t*t*t + b; - }, - easeOutQuint: function (x, t, b, c, d) { - return c*((t=t/d-1)*t*t*t*t + 1) + b; - }, - easeInOutQuint: function (x, t, b, c, d) { - if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b; - return c/2*((t-=2)*t*t*t*t + 2) + b; - }, - easeInSine: function (x, t, b, c, d) { - return -c * Math.cos(t/d * (Math.PI/2)) + c + b; - }, - easeOutSine: function (x, t, b, c, d) { - return c * Math.sin(t/d * (Math.PI/2)) + b; - }, - easeInOutSine: function (x, t, b, c, d) { - return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b; - }, - easeInExpo: function (x, t, b, c, d) { - return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b; - }, - easeOutExpo: function (x, t, b, c, d) { - return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b; - }, - easeInOutExpo: function (x, t, b, c, d) { - if (t==0) return b; - if (t==d) return b+c; - if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b; - return c/2 * (-Math.pow(2, -10 * --t) + 2) + b; - }, - easeInCirc: function (x, t, b, c, d) { - return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b; - }, - easeOutCirc: function (x, t, b, c, d) { - return c * Math.sqrt(1 - (t=t/d-1)*t) + b; - }, - easeInOutCirc: function (x, t, b, c, d) { - if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b; - return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b; - }, - easeInElastic: function (x, t, b, c, d) { - var s=1.70158;var p=0;var a=c; - if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3; - if (a < Math.abs(c)) { a=c; var s=p/4; } - else var s = p/(2*Math.PI) * Math.asin (c/a); - return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b; - }, - easeOutElastic: function (x, t, b, c, d) { - var s=1.70158;var p=0;var a=c; - if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3; - if (a < Math.abs(c)) { a=c; var s=p/4; } - else var s = p/(2*Math.PI) * Math.asin (c/a); - return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b; - }, - easeInOutElastic: function (x, t, b, c, d) { - var s=1.70158;var p=0;var a=c; - if (t==0) return b; if ((t/=d/2)==2) return b+c; if (!p) p=d*(.3*1.5); - if (a < Math.abs(c)) { a=c; var s=p/4; } - else var s = p/(2*Math.PI) * Math.asin (c/a); - if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b; - return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b; - }, - easeInBack: function (x, t, b, c, d, s) { - if (s == undefined) s = 1.70158; - return c*(t/=d)*t*((s+1)*t - s) + b; - }, - easeOutBack: function (x, t, b, c, d, s) { - if (s == undefined) s = 1.70158; - return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b; - }, - easeInOutBack: function (x, t, b, c, d, s) { - if (s == undefined) s = 1.70158; - if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b; - return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b; - }, - easeInBounce: function (x, t, b, c, d) { - return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b; - }, - easeOutBounce: function (x, t, b, c, d) { - if ((t/=d) < (1/2.75)) { - return c*(7.5625*t*t) + b; - } else if (t < (2/2.75)) { - return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b; - } else if (t < (2.5/2.75)) { - return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b; - } else { - return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b; - } - }, - easeInOutBounce: function (x, t, b, c, d) { - if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b; - return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b; - } -}); - -/* - * - * TERMS OF USE - EASING EQUATIONS - * - * Open source under the BSD License. - * - * Copyright © 2001 Robert Penner - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * Neither the name of the author nor the names of contributors may be used to endorse - * or promote products derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ \ No newline at end of file

1 0

r528 - trunk/src
by Mario Gallegos 15 Oct '12

15 Oct '12

Author: mgallegos Date: 2012-10-15 21:18:17 +0200 (Mon, 15 Oct 2012) New Revision: 528 Modified: trunk/src/mc-dia-form2.css Log: Modified: trunk/src/mc-dia-form2.css =================================================================== --- trunk/src/mc-dia-form2.css 2012-10-15 00:08:44 UTC (rev 527) +++ trunk/src/mc-dia-form2.css 2012-10-15 19:18:17 UTC (rev 528) @@ -35,8 +35,7 @@ #containerSlides .form { margin: 20px 72px 0 72px; } - #containerSlides h1, #containerSlides h2 { - font-size: Cantarell, Verdana, sans-serif; + #containerSlides h1, #containerSlides h2 { text-align: center; font-size: 24px; /*text-shadow: 1px 1px 2px #222;*/ @@ -66,7 +65,7 @@ background: url('/mc/0.1/images/input.png') no-repeat !important; color: #888 !important; border: 1px solid #ccc; - font-family: Cantarell, Verdana, sans-serif; + /*font-family: Cantarell, Verdana, sans-serif;*/ font-weight: bold !important; font-size: 15px !important; width: 300px !important; @@ -82,7 +81,7 @@ #languages_tag,#keywords_tag{ color: #888 !important; - font-family: Cantarell, Verdana, sans-serif; + /*font-family: Cantarell, Verdana, sans-serif;*/ font-weight: bold !important; font-size: 15px !important; }

1 0