diff --git a/bower.json b/bower.json index fafdd673..34ecd3cd 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "jquery-cycle2", - "version": "2.1.6", + "version": "2.1.7", "homepage": "https://github.com/malsup/cycle2", "authors": [ "malsup " diff --git a/build/core/jquery.cycle2.autoheight.min.js b/build/core/jquery.cycle2.autoheight.min.js index 0a9a24a4..983fbee0 100644 --- a/build/core/jquery.cycle2.autoheight.min.js +++ b/build/core/jquery.cycle2.autoheight.min.js @@ -1,2 +1,2 @@ -/* Plugin for Cycle2; Copyright (c) 2012 M. Alsup; v20141007 */ -!function(a){"use strict";function b(b,d){var e,f,g,h=d.autoHeight;if("container"==h)f=a(d.slides[d.currSlide]).outerHeight(),d.container.height(f);else if(d._autoHeightRatio)d.container.height(d.container.width()/d._autoHeightRatio);else if("calc"===h||"number"==a.type(h)&&h>=0){if(g="calc"===h?c(b,d):h>=d.slides.length?0:h,g==d._sentinelIndex)return;d._sentinelIndex=g,d._sentinel&&d._sentinel.remove(),e=a(d.slides[g].cloneNode(!0)),e.removeAttr("id name rel").find("[id],[name],[rel]").removeAttr("id name rel"),e.css({position:"static",visibility:"hidden",display:"block"}).prependTo(d.container).addClass("cycle-sentinel cycle-slide").removeClass("cycle-slide-active"),e.find("*").css("visibility","hidden"),d._sentinel=e}}function c(b,c){var d=0,e=-1;return c.slides.each(function(b){var c=a(this).height();c>e&&(e=c,d=b)}),d}function d(b,c,d,e){var f=a(e).outerHeight();c.container.animate({height:f},c.autoHeightSpeed,c.autoHeightEasing)}function e(c,f){f._autoHeightOnResize&&(a(window).off("resize orientationchange",f._autoHeightOnResize),f._autoHeightOnResize=null),f.container.off("cycle-slide-added cycle-slide-removed",b),f.container.off("cycle-destroyed",e),f.container.off("cycle-before",d),f._sentinel&&(f._sentinel.remove(),f._sentinel=null)}a.extend(a.fn.cycle.defaults,{autoHeight:0,autoHeightSpeed:250,autoHeightEasing:null}),a(document).on("cycle-initialized",function(c,f){function g(){b(c,f)}var h,i=f.autoHeight,j=a.type(i),k=null;("string"===j||"number"===j)&&(f.container.on("cycle-slide-added cycle-slide-removed",b),f.container.on("cycle-destroyed",e),"container"==i?f.container.on("cycle-before",d):"string"===j&&/\d+\:\d+/.test(i)&&(h=i.match(/(\d+)\:(\d+)/),h=h[1]/h[2],f._autoHeightRatio=h),"number"!==j&&(f._autoHeightOnResize=function(){clearTimeout(k),k=setTimeout(g,50)},a(window).on("resize orientationchange",f._autoHeightOnResize)),setTimeout(g,30))})}(jQuery); \ No newline at end of file +/* Plugin for Cycle2; Copyright (c) 2012 M. Alsup; 20260120 */ +!function(e){"use strict";function i(i,t){var n,o,c,a=t.autoHeight;if("container"==a)o=e(t.slides[t.currSlide]).outerHeight(),t.container.height(o);else if(t._autoHeightRatio)t.container.height(t.container.width()/t._autoHeightRatio);else if("calc"===a||"number"==typeof a&&a>=0){if(c="calc"===a?function(i,t){var n=0,o=-1;return t.slides.each((function(i){var t=e(this).height();t>o&&(o=t,n=i)})),n}(0,t):a>=t.slides.length?0:a,c==t._sentinelIndex)return;t._sentinelIndex=c,t._sentinel&&t._sentinel.remove(),(n=e(t.slides[c].cloneNode(!0))).removeAttr("id name rel").find("[id],[name],[rel]").removeAttr("id name rel"),n.css({position:"static",visibility:"hidden",display:"block"}).prependTo(t.container).addClass("cycle-sentinel cycle-slide").removeClass("cycle-slide-active"),n.find("*").css("visibility","hidden"),t._sentinel=n}}function t(i,t,n,o,c){var a=e(o).outerHeight();t.container.animate({height:a},t.autoHeightSpeed,t.autoHeightEasing)}function n(o,c){c._autoHeightOnResize&&(e(window).off("resize orientationchange",c._autoHeightOnResize),c._autoHeightOnResize=null),c.container.off("cycle-slide-added cycle-slide-removed",i),c.container.off("cycle-destroyed",n),c.container.off("cycle-before",t),c._sentinel&&(c._sentinel.remove(),c._sentinel=null)}e.extend(e.fn.cycle.defaults,{autoHeight:0,autoHeightSpeed:250,autoHeightEasing:null}),e(document).on("cycle-initialized",(function(o,c){var a,l=c.autoHeight,s=typeof l,r=null;function d(){i(o,c)}"string"!==s&&"number"!==s||(c.container.on("cycle-slide-added cycle-slide-removed",i),c.container.on("cycle-destroyed",n),"container"==l?c.container.on("cycle-before",t):"string"===s&&/\d+\:\d+/.test(l)&&(a=(a=l.match(/(\d+)\:(\d+)/))[1]/a[2],c._autoHeightRatio=a),"number"!==s&&(c._autoHeightOnResize=function(){clearTimeout(r),r=setTimeout(d,50)},e(window).on("resize orientationchange",c._autoHeightOnResize)),setTimeout(d,30))}))}(jQuery); \ No newline at end of file diff --git a/build/core/jquery.cycle2.caption.min.js b/build/core/jquery.cycle2.caption.min.js index b6494bc2..d548a4cd 100644 --- a/build/core/jquery.cycle2.caption.min.js +++ b/build/core/jquery.cycle2.caption.min.js @@ -1,2 +1,2 @@ -/* Plugin for Cycle2; Copyright (c) 2012 M. Alsup; v20141007 */ -!function(a){"use strict";a.extend(a.fn.cycle.defaults,{caption:"> .cycle-caption",captionTemplate:"{{slideNum}} / {{slideCount}}",overlay:"> .cycle-overlay",overlayTemplate:"
{{title}}
{{desc}}
",captionModule:"caption"}),a(document).on("cycle-update-view",function(b,c,d,e){if("caption"===c.captionModule){a.each(["caption","overlay"],function(){var a=this,b=d[a+"Template"],f=c.API.getComponent(a);f.length&&b?(f.html(c.API.tmpl(b,d,c,e)),f.show()):f.hide()})}}),a(document).on("cycle-destroyed",function(b,c){var d;a.each(["caption","overlay"],function(){var a=this,b=c[a+"Template"];c[a]&&b&&(d=c.API.getComponent("caption"),d.empty())})})}(jQuery); \ No newline at end of file +/*! caption plugin for Cycle2; version: 20260120 */ +!function(e){"use strict";e.extend(e.fn.cycle.defaults,{caption:"> .cycle-caption",captionTemplate:"{{slideNum}} / {{slideCount}}",overlay:"> .cycle-overlay",overlayTemplate:"
{{title}}
{{desc}}
",captionModule:"caption"}),e(document).on("cycle-update-view",(function(t,o,n,c){"caption"===o.captionModule&&e.each(["caption","overlay"],(function(){var e=n[this+"Template"],t=o.API.getComponent(this);t.length&&e?(t.html(o.API.tmpl(e,n,o,c)),t.show()):t.hide()}))})),e(document).on("cycle-destroyed",(function(t,o){e.each(["caption","overlay"],(function(){var e=o[this+"Template"];o[this]&&e&&o.API.getComponent("caption").empty()}))}))}(jQuery); \ No newline at end of file diff --git a/build/core/jquery.cycle2.command.min.js b/build/core/jquery.cycle2.command.min.js index 1ac4c206..2fe192ac 100644 --- a/build/core/jquery.cycle2.command.min.js +++ b/build/core/jquery.cycle2.command.min.js @@ -1,2 +1,2 @@ -/* Plugin for Cycle2; Copyright (c) 2012 M. Alsup; v20141007 */ -!function(a){"use strict";var b=a.fn.cycle;a.fn.cycle=function(c){var d,e,f,g=a.makeArray(arguments);return"number"==a.type(c)?this.cycle("goto",c):"string"==a.type(c)?this.each(function(){var h;return d=c,f=a(this).data("cycle.opts"),void 0===f?void b.log('slideshow must be initialized before sending commands; "'+d+'" ignored'):(d="goto"==d?"jump":d,e=f.API[d],a.isFunction(e)?(h=a.makeArray(g),h.shift(),e.apply(f.API,h)):void b.log("unknown command: ",d))}):b.apply(this,arguments)},a.extend(a.fn.cycle,b),a.extend(b.API,{next:function(){var a=this.opts();if(!a.busy||a.manualTrump){var b=a.reverse?-1:1;a.allowWrap===!1&&a.currSlide+b>=a.slideCount||(a.API.advanceSlide(b),a.API.trigger("cycle-next",[a]).log("cycle-next"))}},prev:function(){var a=this.opts();if(!a.busy||a.manualTrump){var b=a.reverse?1:-1;a.allowWrap===!1&&a.currSlide+b<0||(a.API.advanceSlide(b),a.API.trigger("cycle-prev",[a]).log("cycle-prev"))}},destroy:function(){this.stop();var b=this.opts(),c=a.isFunction(a._data)?a._data:a.noop;clearTimeout(b.timeoutId),b.timeoutId=0,b.API.stop(),b.API.trigger("cycle-destroyed",[b]).log("cycle-destroyed"),b.container.removeData(),c(b.container[0],"parsedAttrs",!1),b.retainStylesOnDestroy||(b.container.removeAttr("style"),b.slides.removeAttr("style"),b.slides.removeClass(b.slideActiveClass)),b.slides.each(function(){var d=a(this);d.removeData(),d.removeClass(b.slideClass),c(this,"parsedAttrs",!1)})},jump:function(a,b){var c,d=this.opts();if(!d.busy||d.manualTrump){var e=parseInt(a,10);if(isNaN(e)||0>e||e>=d.slides.length)return void d.API.log("goto: invalid slide index: "+e);if(e==d.currSlide)return void d.API.log("goto: skipping, already on slide",e);d.nextSlide=e,clearTimeout(d.timeoutId),d.timeoutId=0,d.API.log("goto: ",e," (zero-index)"),c=d.currSlide=e.slideCount||(e.API.advanceSlide(t),e.API.trigger("cycle-next",[e]).log("cycle-next"))}},prev:function(){var e=this.opts();if(!e.busy||e.manualTrump){var t=e.reverse?1:-1;!1===e.allowWrap&&e.currSlide+t<0||(e.API.advanceSlide(t),e.API.trigger("cycle-prev",[e]).log("cycle-prev"))}},destroy:function(){this.stop();var t=this.opts(),r="function"==typeof e._data?e._data:e.noop;clearTimeout(t.timeoutId),t.timeoutId=0,t.API.stop(),t.API.trigger("cycle-destroyed",[t]).log("cycle-destroyed"),t.container.removeData(),r(t.container[0],"parsedAttrs",!1),t.retainStylesOnDestroy||(t.container.removeAttr("style"),t.slides.removeAttr("style"),t.slides.removeClass(t.slideActiveClass)),t.slides.each((function(){var o=e(this);o.removeData(),o.removeClass(t.slideClass),r(this,"parsedAttrs",!1)}))},jump:function(e,t){var r,o=this.opts();if(!o.busy||o.manualTrump){var i=parseInt(e,10);isNaN(i)||i<0||i>=o.slides.length?o.API.log("goto: invalid slide index: "+i):i!=o.currSlide?(o.nextSlide=i,clearTimeout(o.timeoutId),o.timeoutId=0,o.API.log("goto: ",i," (zero-index)"),r=o.currSlidef&&e.slideCount>=1,g&&(e._initialized?e.timeout&&(d=e.slides.length,e.nextSlide=e.reverse?d-1:1,e.timeoutId||e.API.queueTransition(e)):e.API.initSlideshow())},calcFirstSlide:function(){var a,b=this.opts();a=parseInt(b.startingSlide||0,10),(a>=b.slides.length||0>a)&&(a=0),b.currSlide=a,b.reverse?(b.nextSlide=a-1,b.nextSlide<0&&(b.nextSlide=b.slides.length-1)):(b.nextSlide=a+1,b.nextSlide==b.slides.length&&(b.nextSlide=0))},calcNextSlide:function(){var a,b=this.opts();b.reverse?(a=b.nextSlide-1<0,b.nextSlide=a?b.slideCount-1:b.nextSlide-1,b.currSlide=a?0:b.nextSlide+1):(a=b.nextSlide+1==b.slides.length,b.nextSlide=a?0:b.nextSlide+1,b.currSlide=a?b.slides.length-1:b.nextSlide-1)},calcTx:function(b,c){var d,e=b;return e._tempFx?d=a.fn.cycle.transitions[e._tempFx]:c&&e.manualFx&&(d=a.fn.cycle.transitions[e.manualFx]),d||(d=a.fn.cycle.transitions[e.fx]),e._tempFx=null,this.opts()._tempFx=null,d||(d=a.fn.cycle.transitions.fade,e.API.log('Transition "'+e.fx+'" not found. Using fade.')),d},prepareTx:function(a,b){var c,d,e,f,g,h=this.opts();return h.slideCount<2?void(h.timeoutId=0):(!a||h.busy&&!h.manualTrump||(h.API.stopTransition(),h.busy=!1,clearTimeout(h.timeoutId),h.timeoutId=0),void(h.busy||(0!==h.timeoutId||a)&&(d=h.slides[h.currSlide],e=h.slides[h.nextSlide],f=h.API.getSlideOpts(h.nextSlide),g=h.API.calcTx(f,a),h._tx=g,a&&void 0!==f.manualSpeed&&(f.speed=f.manualSpeed),h.nextSlide!=h.currSlide&&(a||!h.paused&&!h.hoverPaused&&h.timeout)?(h.API.trigger("cycle-before",[f,d,e,b]),g.before&&g.before(f,d,e,b),c=function(){h.busy=!1,h.container.data("cycle.opts")&&(g.after&&g.after(f,d,e,b),h.API.trigger("cycle-after",[f,d,e,b]),h.API.queueTransition(f),h.API.updateView(!0))},h.busy=!0,g.transition?g.transition(f,d,e,b,c):h.API.doTransition(f,d,e,b,c),h.API.calcNextSlide(),h.API.updateView()):h.API.queueTransition(f))))},doTransition:function(b,c,d,e,f){var g=b,h=a(c),i=a(d),j=function(){i.animate(g.animIn||{opacity:1},g.speed,g.easeIn||g.easing,f)};i.css(g.cssBefore||{}),h.animate(g.animOut||{},g.speed,g.easeOut||g.easing,function(){h.css(g.cssAfter||{}),g.sync||j()}),g.sync&&j()},queueTransition:function(b,c){var d=this.opts(),e=void 0!==c?c:b.timeout;return 0===d.nextSlide&&0===--d.loop?(d.API.log("terminating; loop=0"),d.timeout=0,e?setTimeout(function(){d.API.trigger("cycle-finished",[d])},e):d.API.trigger("cycle-finished",[d]),void(d.nextSlide=d.currSlide)):void 0!==d.continueAuto&&(d.continueAuto===!1||a.isFunction(d.continueAuto)&&d.continueAuto()===!1)?(d.API.log("terminating automatic transitions"),d.timeout=0,void(d.timeoutId&&clearTimeout(d.timeoutId))):void(e&&(d._lastQueue=a.now(),void 0===c&&(d._remainingTimeout=b.timeout),d.paused||d.hoverPaused||(d.timeoutId=setTimeout(function(){d.API.prepareTx(!1,!d.reverse)},e))))},stopTransition:function(){var a=this.opts();a.slides.filter(":animated").length&&(a.slides.stop(!1,!0),a.API.trigger("cycle-transition-stopped",[a])),a._tx&&a._tx.stopTransition&&a._tx.stopTransition(a)},advanceSlide:function(a){var b=this.opts();return clearTimeout(b.timeoutId),b.timeoutId=0,b.nextSlide=b.currSlide+a,b.nextSlide<0?b.nextSlide=b.slides.length-1:b.nextSlide>=b.slides.length&&(b.nextSlide=0),b.API.prepareTx(!0,a>=0),!1},buildSlideOpts:function(c){var d,e,f=this.opts(),g=c.data()||{};for(var h in g)g.hasOwnProperty(h)&&/^cycle[A-Z]+/.test(h)&&(d=g[h],e=h.match(/^cycle(.*)/)[1].replace(/^[A-Z]/,b),f.API.log("["+(f.slideCount-1)+"]",e+":",d,"("+typeof d+")"),g[e]=d);g=a.extend({},a.fn.cycle.defaults,f,g),g.slideNum=f.slideCount;try{delete g.API,delete g.slideCount,delete g.currSlide,delete g.nextSlide,delete g.slides}catch(i){}return g},getSlideOpts:function(b){var c=this.opts();void 0===b&&(b=c.currSlide);var d=c.slides[b],e=a(d).data("cycle.opts");return a.extend({},c,e)},initSlide:function(b,c,d){var e=this.opts();c.css(b.slideCss||{}),d>0&&c.css("zIndex",d),isNaN(b.speed)&&(b.speed=a.fx.speeds[b.speed]||a.fx.speeds._default),b.sync||(b.speed=b.speed/2),c.addClass(e.slideClass)},updateView:function(a,b){var c=this.opts();if(c._initialized){var d=c.API.getSlideOpts(),e=c.slides[c.currSlide];!a&&b!==!0&&(c.API.trigger("cycle-update-view-before",[c,d,e]),c.updateView<0)||(c.slideActiveClass&&c.slides.removeClass(c.slideActiveClass).eq(c.currSlide).addClass(c.slideActiveClass),a&&c.hideNonActive&&c.slides.filter(":not(."+c.slideActiveClass+")").css("visibility","hidden"),0===c.updateView&&setTimeout(function(){c.API.trigger("cycle-update-view",[c,d,e,a])},d.speed/(c.sync?2:1)),0!==c.updateView&&c.API.trigger("cycle-update-view",[c,d,e,a]),a&&c.API.trigger("cycle-update-view-after",[c,d,e]))}},getComponent:function(b){var c=this.opts(),d=c[b];return"string"==typeof d?/^\s*[\>|\+|~]/.test(d)?c.container.find(d):a(d):d.jquery?d:a(d)},stackSlides:function(b,c,d){var e=this.opts();b||(b=e.slides[e.currSlide],c=e.slides[e.nextSlide],d=!e.reverse),a(b).css("zIndex",e.maxZ);var f,g=e.maxZ-2,h=e.slideCount;if(d){for(f=e.currSlide+1;h>f;f++)a(e.slides[f]).css("zIndex",g--);for(f=0;f=0;f--)a(e.slides[f]).css("zIndex",g--);for(f=h-1;f>e.currSlide;f--)a(e.slides[f]).css("zIndex",g--)}a(c).css("zIndex",e.maxZ-1)},getSlideIndex:function(a){return this.opts().slides.index(a)}},a.fn.cycle.log=function(){window.console&&console.log&&console.log("[cycle2] "+Array.prototype.join.call(arguments," "))},a.fn.cycle.version=function(){return"Cycle2: "+c},a.fn.cycle.transitions={custom:{},none:{before:function(a,b,c,d){a.API.stackSlides(c,b,d),a.cssBefore={opacity:1,visibility:"visible",display:"block"}}},fade:{before:function(b,c,d,e){var f=b.API.getSlideOpts(b.nextSlide).slideCss||{};b.API.stackSlides(c,d,e),b.cssBefore=a.extend(f,{opacity:0,visibility:"visible",display:"block"}),b.animIn={opacity:1},b.animOut={opacity:0}}},fadeout:{before:function(b,c,d,e){var f=b.API.getSlideOpts(b.nextSlide).slideCss||{};b.API.stackSlides(c,d,e),b.cssBefore=a.extend(f,{opacity:1,visibility:"visible",display:"block"}),b.animOut={opacity:0}}},scrollHorz:{before:function(a,b,c,d){a.API.stackSlides(b,c,d);var e=a.container.css("overflow","hidden").width();a.cssBefore={left:d?e:-e,top:0,opacity:1,visibility:"visible",display:"block"},a.cssAfter={zIndex:a._maxZ-2,left:0},a.animIn={left:0},a.animOut={left:d?-e:e}}}},a.fn.cycle.defaults={allowWrap:!0,autoSelector:".cycle-slideshow[data-cycle-auto-init!=false]",delay:0,easing:null,fx:"fade",hideNonActive:!0,loop:0,manualFx:void 0,manualSpeed:void 0,manualTrump:!0,maxZ:100,pauseOnHover:!1,reverse:!1,slideActiveClass:"cycle-slide-active",slideClass:"cycle-slide",slideCss:{position:"absolute",top:0,left:0},slides:"> img",speed:500,startingSlide:0,sync:!0,timeout:4e3,updateView:0},a(document).ready(function(){a(a.fn.cycle.defaults.autoSelector).cycle()})}(jQuery); \ No newline at end of file +!function(e){"use strict";function i(e){return(e||"").toLowerCase()}e.fn.cycle=function(t){var s;return 0!==this.length||e.isReady?this.each((function(){var s,n,l,o,d=e(this),a=e.fn.cycle.log;if(!d.data("cycle.opts")){for(var c in(!1===d.data("cycle-log")||t&&!1===t.log||n&&!1===n.log)&&(a=e.noop),a("--c2 init--"),s=e.extend({},d.data()||{}))s.hasOwnProperty(c)&&/^cycle[A-Z]+/.test(c)&&(o=s[c],a((l=c.match(/^cycle(.*)/)[1].replace(/^[A-Z]/,i))+":",o,"("+typeof o+")"),s[l]=o);(n=e.extend({},e.fn.cycle.defaults,s,t||{})).timeoutId=0,n.paused=n.paused||!1,n.container=d,n._maxZ=n.maxZ,n.API=e.extend({_container:d},e.fn.cycle.API),n.API.log=a,n.API.trigger=function(e,i){return n.container.trigger(e,i),n.API},d.data("cycle.opts",n),d.data("cycle.API",n.API),n.API.trigger("cycle-bootstrap",[n,n.API]),n.API.addInitialSlides(),n.API.preInitSlideshow(),n.slides.length&&n.API.initSlideshow()}})):(s={s:this.selector,c:this.context},e.fn.cycle.log("requeuing slideshow (dom not ready)"),e((function(){e(s.s,s.c).cycle(t)})),this)},e.fn.cycle.API={opts:function(){return this._container.data("cycle.opts")},addInitialSlides:function(){var i=this.opts(),t=i.slides;i.slideCount=0,i.slides=e(),t=t.jquery?t:i.container.find(t),i.random&&[].sort.call(t,(function(e,i){return Math.random()-.5})),i.API.add(t)},preInitSlideshow:function(){var i=this.opts();i.API.trigger("cycle-pre-initialize",[i]);var t=e.fn.cycle.transitions[i.fx];t&&"function"==typeof t.preInit&&t.preInit(i),i._preInitialized=!0},postInitSlideshow:function(){var i=this.opts();i.API.trigger("cycle-post-initialize",[i]);var t=e.fn.cycle.transitions[i.fx];t&&"function"==typeof t.postInit&&t.postInit(i)},initSlideshow:function(){var i,t=this.opts(),s=t.container;t.API.calcFirstSlide(),"static"==t.container.css("position")&&t.container.css("position","relative"),e(t.slides[t.currSlide]).css({opacity:1,display:"block",visibility:"visible"}),t.API.stackSlides(t.slides[t.currSlide],t.slides[t.nextSlide],!t.reverse),t.pauseOnHover&&(!0!==t.pauseOnHover&&(s=e(t.pauseOnHover)),s.on("mouseenter",(function(){t.API.pause(!0)})).on("mouseleave",(function(){t.API.resume(!0)}))),t.timeout&&(i=t.API.getSlideOpts(t.currSlide),t.API.queueTransition(i,i.timeout+t.delay)),t._initialized=!0,t.API.updateView(!0),t.API.trigger("cycle-initialized",[t]),t.API.postInitSlideshow()},pause:function(e){var i=this.opts(),t=i.API.getSlideOpts(),s=i.hoverPaused||i.paused;e?i.hoverPaused=!0:i.paused=!0,s||(i.container.addClass("cycle-paused"),i.API.trigger("cycle-paused",[i]).log("cycle-paused"),t.timeout&&(clearTimeout(i.timeoutId),i.timeoutId=0,i._remainingTimeout-=Date.now()-i._lastQueue,(i._remainingTimeout<0||isNaN(i._remainingTimeout))&&(i._remainingTimeout=void 0)))},resume:function(e){var i=this.opts(),t=!i.hoverPaused&&!i.paused;e?i.hoverPaused=!1:i.paused=!1,t||(i.container.removeClass("cycle-paused"),0===i.slides.filter(":animated").length&&i.API.queueTransition(i.API.getSlideOpts(),i._remainingTimeout),i.API.trigger("cycle-resumed",[i,i._remainingTimeout]).log("cycle-resumed"))},add:function(i,t){var s,n=this.opts(),l=n.slideCount;"string"==typeof i&&(i=e.trim(i)),e(i).each((function(i){var s,l=e(this);t?n.container.prepend(l):n.container.append(l),n.slideCount++,s=n.API.buildSlideOpts(l),n.slides=t?e(l).add(n.slides):n.slides.add(l),n.API.initSlide(s,l,--n._maxZ),l.data("cycle.opts",s),n.API.trigger("cycle-slide-added",[n,s,l])})),n.API.updateView(!0),n._preInitialized&&l<2&&n.slideCount>=1&&(n._initialized?n.timeout&&(s=n.slides.length,n.nextSlide=n.reverse?s-1:1,n.timeoutId||n.API.queueTransition(n)):n.API.initSlideshow())},calcFirstSlide:function(){var e,i=this.opts();((e=parseInt(i.startingSlide||0,10))>=i.slides.length||e<0)&&(e=0),i.currSlide=e,i.reverse?(i.nextSlide=e-1,i.nextSlide<0&&(i.nextSlide=i.slides.length-1)):(i.nextSlide=e+1,i.nextSlide==i.slides.length&&(i.nextSlide=0))},calcNextSlide:function(){var e,i=this.opts();i.reverse?(e=i.nextSlide-1<0,i.nextSlide=e?i.slideCount-1:i.nextSlide-1,i.currSlide=e?0:i.nextSlide+1):(e=i.nextSlide+1==i.slides.length,i.nextSlide=e?0:i.nextSlide+1,i.currSlide=e?i.slides.length-1:i.nextSlide-1)},calcTx:function(i,t){var s,n=i;return n._tempFx?s=e.fn.cycle.transitions[n._tempFx]:t&&n.manualFx&&(s=e.fn.cycle.transitions[n.manualFx]),s||(s=e.fn.cycle.transitions[n.fx]),n._tempFx=null,this.opts()._tempFx=null,s||(s=e.fn.cycle.transitions.fade,n.API.log('Transition "'+n.fx+'" not found. Using fade.')),s},prepareTx:function(e,i){var t,s,n,l,o,d=this.opts();d.slideCount<2?d.timeoutId=0:(!e||d.busy&&!d.manualTrump||(d.API.stopTransition(),d.busy=!1,clearTimeout(d.timeoutId),d.timeoutId=0),d.busy||(0!==d.timeoutId||e)&&(s=d.slides[d.currSlide],n=d.slides[d.nextSlide],l=d.API.getSlideOpts(d.nextSlide),o=d.API.calcTx(l,e),d._tx=o,e&&void 0!==l.manualSpeed&&(l.speed=l.manualSpeed),d.nextSlide!=d.currSlide&&(e||!d.paused&&!d.hoverPaused&&d.timeout)?(d.API.trigger("cycle-before",[l,s,n,i]),o.before&&o.before(l,s,n,i),t=function(){d.busy=!1,d.container.data("cycle.opts")&&(o.after&&o.after(l,s,n,i),d.API.trigger("cycle-after",[l,s,n,i]),d.API.queueTransition(l),d.API.updateView(!0))},d.busy=!0,o.transition?o.transition(l,s,n,i,t):d.API.doTransition(l,s,n,i,t),d.API.calcNextSlide(),d.API.updateView()):d.API.queueTransition(l)))},doTransition:function(i,t,s,n,l){var o=i,d=e(t),a=e(s),c=function(){a.animate(o.animIn||{opacity:1},o.speed,o.easeIn||o.easing,l)};a.css(o.cssBefore||{}),d.animate(o.animOut||{},o.speed,o.easeOut||o.easing,(function(){d.css(o.cssAfter||{}),o.sync||c()})),o.sync&&c()},queueTransition:function(e,i){var t=this.opts(),s=void 0!==i?i:e.timeout;return 0===t.nextSlide&&0==--t.loop?(t.API.log("terminating; loop=0"),t.timeout=0,s?setTimeout((function(){t.API.trigger("cycle-finished",[t])}),s):t.API.trigger("cycle-finished",[t]),void(t.nextSlide=t.currSlide)):void 0!==t.continueAuto&&(!1===t.continueAuto||"function"==typeof t.continueAuto&&!1===t.continueAuto())?(t.API.log("terminating automatic transitions"),t.timeout=0,void(t.timeoutId&&clearTimeout(t.timeoutId))):void(s&&(t._lastQueue=Date.now(),void 0===i&&(t._remainingTimeout=e.timeout),t.paused||t.hoverPaused||(t.timeoutId=setTimeout((function(){t.API.prepareTx(!1,!t.reverse)}),s))))},stopTransition:function(){var e=this.opts();e.slides.filter(":animated").length&&(e.slides.stop(!1,!0),e.API.trigger("cycle-transition-stopped",[e])),e._tx&&e._tx.stopTransition&&e._tx.stopTransition(e)},advanceSlide:function(e){var i=this.opts();return clearTimeout(i.timeoutId),i.timeoutId=0,i.nextSlide=i.currSlide+e,i.nextSlide<0?i.nextSlide=i.slides.length-1:i.nextSlide>=i.slides.length&&(i.nextSlide=0),i.API.prepareTx(!0,e>=0),!1},buildSlideOpts:function(t){var s,n,l=this.opts(),o=e.extend({},t.data()||{});for(var d in o)o.hasOwnProperty(d)&&/^cycle[A-Z]+/.test(d)&&(s=o[d],n=d.match(/^cycle(.*)/)[1].replace(/^[A-Z]/,i),l.API.log("["+(l.slideCount-1)+"]",n+":",s,"("+typeof s+")"),o[n]=s);(o=e.extend({},e.fn.cycle.defaults,l,o)).slideNum=l.slideCount;try{delete o.API,delete o.slideCount,delete o.currSlide,delete o.nextSlide,delete o.slides}catch(e){}return o},getSlideOpts:function(i){var t=this.opts();void 0===i&&(i=t.currSlide);var s=t.slides[i],n=e(s).data("cycle.opts");return e.extend({},t,n)},initSlide:function(i,t,s){var n=this.opts();t.css(i.slideCss||{}),s>0&&t.css("zIndex",s),isNaN(i.speed)&&(i.speed=e.fx.speeds[i.speed]||e.fx.speeds._default),i.sync||(i.speed=i.speed/2),t.addClass(n.slideClass)},updateView:function(e,i,t){var s=this.opts();if(s._initialized){var n=s.API.getSlideOpts(),l=s.slides[s.currSlide];!e&&!0!==i&&(s.API.trigger("cycle-update-view-before",[s,n,l]),s.updateView<0)||(s.slideActiveClass&&s.slides.removeClass(s.slideActiveClass).eq(s.currSlide).addClass(s.slideActiveClass),e&&s.hideNonActive&&s.slides.filter(":not(."+s.slideActiveClass+")").css("visibility","hidden"),0===s.updateView&&setTimeout((function(){s.API.trigger("cycle-update-view",[s,n,l,e])}),n.speed/(s.sync?2:1)),0!==s.updateView&&s.API.trigger("cycle-update-view",[s,n,l,e]),e&&s.API.trigger("cycle-update-view-after",[s,n,l]))}},getComponent:function(i){var t=this.opts(),s=t[i];return"string"==typeof s?/^\s*[\>|\+|~]/.test(s)?t.container.find(s):e(s):s.jquery?s:e(s)},stackSlides:function(i,t,s){var n,l=this.opts();i||(i=l.slides[l.currSlide],t=l.slides[l.nextSlide],s=!l.reverse),e(i).css("zIndex",l.maxZ);var o=l.maxZ-2,d=l.slideCount;if(s){for(n=l.currSlide+1;n=0;n--)e(l.slides[n]).css("zIndex",o--);for(n=d-1;n>l.currSlide;n--)e(l.slides[n]).css("zIndex",o--)}e(t).css("zIndex",l.maxZ-1)},getSlideIndex:function(e){return this.opts().slides.index(e)}},e.fn.cycle.log=function(){window.console&&console.log&&console.log("[cycle2] "+Array.prototype.join.call(arguments," "))},e.fn.cycle.version=function(){return"Cycle2: 2.1.7"},e.fn.cycle.transitions={custom:{},none:{before:function(e,i,t,s){e.API.stackSlides(t,i,s),e.cssBefore={opacity:1,visibility:"visible",display:"block"}}},fade:{before:function(i,t,s,n){var l=i.API.getSlideOpts(i.nextSlide).slideCss||{};i.API.stackSlides(t,s,n),i.cssBefore=e.extend(l,{opacity:0,visibility:"visible",display:"block"}),i.animIn={opacity:1},i.animOut={opacity:0}}},fadeout:{before:function(i,t,s,n){var l=i.API.getSlideOpts(i.nextSlide).slideCss||{};i.API.stackSlides(t,s,n),i.cssBefore=e.extend(l,{opacity:1,visibility:"visible",display:"block"}),i.animOut={opacity:0}}},scrollHorz:{before:function(e,i,t,s){e.API.stackSlides(i,t,s);var n=e.container.css("overflow","hidden").width();e.cssBefore={left:s?n:-n,top:0,opacity:1,visibility:"visible",display:"block"},e.cssAfter={zIndex:e._maxZ-2,left:0},e.animIn={left:0},e.animOut={left:s?-n:n}}},scrollVert:{before:function(e,i,t,s){e.API.stackSlides(e,i,t,s);var n=e.container.css("overflow","hidden").height();e.cssBefore={top:s?-n:n,left:0,opacity:1,display:"block",visibility:"visible"},e.animIn={top:0},e.animOut={top:s?n:-n}}}},e.fn.cycle.defaults={allowWrap:!0,autoSelector:".cycle-slideshow[data-cycle-auto-init!=false]",delay:0,easing:null,fx:"fade",hideNonActive:!0,loop:0,manualFx:void 0,manualSpeed:void 0,manualTrump:!0,maxZ:100,pauseOnHover:!1,reverse:!1,slideActiveClass:"cycle-slide-active",slideClass:"cycle-slide",slideCss:{position:"absolute",top:0,left:0},slides:"> img",speed:500,startingSlide:0,sync:!0,timeout:4e3,updateView:0},e(document).ready((function(){e(e.fn.cycle.defaults.autoSelector).cycle()}))}(jQuery); \ No newline at end of file diff --git a/build/core/jquery.cycle2.hash.min.js b/build/core/jquery.cycle2.hash.min.js index bda1de6c..76549b7b 100644 --- a/build/core/jquery.cycle2.hash.min.js +++ b/build/core/jquery.cycle2.hash.min.js @@ -1,2 +1,2 @@ -/* Plugin for Cycle2; Copyright (c) 2012 M. Alsup; v20141007 */ -!function(a){"use strict";function b(b,c){var d;return b._hashFence?void(b._hashFence=!1):(d=window.location.hash.substring(1),void b.slides.each(function(e){if(a(this).data("cycle-hash")==d){if(c===!0)b.startingSlide=e;else{var f=b.currSlide .cycle-pager",pagerActiveClass:"cycle-pager-active",pagerEvent:"click.cycle",pagerEventBubble:void 0,pagerTemplate:"•"}),a(document).on("cycle-bootstrap",function(a,c,d){d.buildPagerLink=b}),a(document).on("cycle-slide-added",function(a,b,d,e){b.pager&&(b.API.buildPagerLink(b,d,e),b.API.page=c)}),a(document).on("cycle-slide-removed",function(b,c,d){if(c.pager){var e=c.API.getComponent("pager");e.each(function(){var b=a(this);a(b.children()[d]).remove()})}}),a(document).on("cycle-update-view",function(b,c){var d;c.pager&&(d=c.API.getComponent("pager"),d.each(function(){a(this).children().removeClass(c.pagerActiveClass).eq(c.currSlide).addClass(c.pagerActiveClass)}))}),a(document).on("cycle-destroyed",function(a,b){var c=b.API.getComponent("pager");c&&(c.children().off(b.pagerEvent),b.pagerTemplate&&c.empty())})}(jQuery); \ No newline at end of file +/* Plugin for Cycle2; Copyright (c) 2012 M. Alsup; 20260120 */ +!function(e){"use strict";function n(n,a,t){var r;n.API.getComponent("pager").each((function(){var c=e(this);if(a.pagerTemplate){var p=n.API.tmpl(a.pagerTemplate,a,n,t[0]);r=e(p).appendTo(c)}else r=c.children().eq(n.slideCount-1);r.on(n.pagerEvent,(function(e){n.pagerEventBubble||e.preventDefault(),n.API.page(c,e.currentTarget)}))}))}function a(e,n){var a=this.opts();if(!a.busy||a.manualTrump){var t=e.children().index(n),r=a.currSlide .cycle-pager",pagerActiveClass:"cycle-pager-active",pagerEvent:"click.cycle",pagerEventBubble:void 0,pagerTemplate:"•"}),e(document).on("cycle-bootstrap",(function(e,a,t){t.buildPagerLink=n})),e(document).on("cycle-slide-added",(function(e,n,t,r){n.pager&&(n.API.buildPagerLink(n,t,r),n.API.page=a)})),e(document).on("cycle-slide-removed",(function(n,a,t,r){a.pager&&a.API.getComponent("pager").each((function(){var n=e(this);e(n.children()[t]).remove()}))})),e(document).on("cycle-update-view",(function(n,a,t){a.pager&&a.API.getComponent("pager").each((function(){e(this).children().removeClass(a.pagerActiveClass).eq(a.currSlide).addClass(a.pagerActiveClass)}))})),e(document).on("cycle-destroyed",(function(e,n){var a=n.API.getComponent("pager");a&&(a.children().off(n.pagerEvent),n.pagerTemplate&&a.empty())}))}(jQuery); \ No newline at end of file diff --git a/build/core/jquery.cycle2.prevnext.min.js b/build/core/jquery.cycle2.prevnext.min.js index e7f32956..2f7db1ba 100644 --- a/build/core/jquery.cycle2.prevnext.min.js +++ b/build/core/jquery.cycle2.prevnext.min.js @@ -1,2 +1,2 @@ -/* Plugin for Cycle2; Copyright (c) 2012 M. Alsup; v20141007 */ -!function(a){"use strict";a.extend(a.fn.cycle.defaults,{next:"> .cycle-next",nextEvent:"click.cycle",disabledClass:"disabled",prev:"> .cycle-prev",prevEvent:"click.cycle",swipe:!1}),a(document).on("cycle-initialized",function(a,b){if(b.API.getComponent("next").on(b.nextEvent,function(a){a.preventDefault(),b.API.next()}),b.API.getComponent("prev").on(b.prevEvent,function(a){a.preventDefault(),b.API.prev()}),b.swipe){var c=b.swipeVert?"swipeUp.cycle":"swipeLeft.cycle swipeleft.cycle",d=b.swipeVert?"swipeDown.cycle":"swipeRight.cycle swiperight.cycle";b.container.on(c,function(){b._tempFx=b.swipeFx,b.API.next()}),b.container.on(d,function(){b._tempFx=b.swipeFx,b.API.prev()})}}),a(document).on("cycle-update-view",function(a,b){if(!b.allowWrap){var c=b.disabledClass,d=b.API.getComponent("next"),e=b.API.getComponent("prev"),f=b._prevBoundry||0,g=void 0!==b._nextBoundry?b._nextBoundry:b.slideCount-1;b.currSlide==g?d.addClass(c).prop("disabled",!0):d.removeClass(c).prop("disabled",!1),b.currSlide===f?e.addClass(c).prop("disabled",!0):e.removeClass(c).prop("disabled",!1)}}),a(document).on("cycle-destroyed",function(a,b){b.API.getComponent("prev").off(b.nextEvent),b.API.getComponent("next").off(b.prevEvent),b.container.off("swipeleft.cycle swiperight.cycle swipeLeft.cycle swipeRight.cycle swipeUp.cycle swipeDown.cycle")})}(jQuery); \ No newline at end of file +/* Plugin for Cycle2; Copyright (c) 2012 M. Alsup; 20260120 */ +!function(e){"use strict";e.extend(e.fn.cycle.defaults,{next:"> .cycle-next",nextEvent:"click.cycle",disabledClass:"disabled",prev:"> .cycle-prev",prevEvent:"click.cycle",swipe:!1}),e(document).on("cycle-initialized",(function(e,n){if(n.API.getComponent("next").on(n.nextEvent,(function(e){e.preventDefault(),n.API.next()})),n.API.getComponent("prev").on(n.prevEvent,(function(e){e.preventDefault(),n.API.prev()})),n.swipe){var t=n.swipeVert?"swipeUp.cycle":"swipeLeft.cycle swipeleft.cycle",c=n.swipeVert?"swipeDown.cycle":"swipeRight.cycle swiperight.cycle";n.container.on(t,(function(e){n._tempFx=n.swipeFx,n.API.next()})),n.container.on(c,(function(){n._tempFx=n.swipeFx,n.API.prev()}))}})),e(document).on("cycle-update-view",(function(e,n,t,c){if(!n.allowWrap){var i=n.disabledClass,o=n.API.getComponent("next"),p=n.API.getComponent("prev"),l=n._prevBoundry||0,s=void 0!==n._nextBoundry?n._nextBoundry:n.slideCount-1;n.currSlide==s?o.addClass(i).prop("disabled",!0):o.removeClass(i).prop("disabled",!1),n.currSlide===l?p.addClass(i).prop("disabled",!0):p.removeClass(i).prop("disabled",!1)}})),e(document).on("cycle-destroyed",(function(e,n){n.API.getComponent("prev").off(n.nextEvent),n.API.getComponent("next").off(n.prevEvent),n.container.off("swipeleft.cycle swiperight.cycle swipeLeft.cycle swipeRight.cycle swipeUp.cycle swipeDown.cycle")}))}(jQuery); \ No newline at end of file diff --git a/build/core/jquery.cycle2.progressive.min.js b/build/core/jquery.cycle2.progressive.min.js index c6844122..b93ba3c4 100644 --- a/build/core/jquery.cycle2.progressive.min.js +++ b/build/core/jquery.cycle2.progressive.min.js @@ -1,2 +1,2 @@ -/* Plugin for Cycle2; Copyright (c) 2012 M. Alsup; v20141007 */ -!function(a){"use strict";a.extend(a.fn.cycle.defaults,{progressive:!1}),a(document).on("cycle-pre-initialize",function(b,c){if(c.progressive){var d,e,f=c.API,g=f.next,h=f.prev,i=f.prepareTx,j=a.type(c.progressive);if("array"==j)d=c.progressive;else if(a.isFunction(c.progressive))d=c.progressive(c);else if("string"==j){if(e=a(c.progressive),d=a.trim(e.html()),!d)return;if(/^(\[)/.test(d))try{d=a.parseJSON(d)}catch(k){return void f.log("error parsing progressive slides",k)}else d=d.split(new RegExp(e.data("cycle-split")||"\n")),d[d.length-1]||d.pop()}i&&(f.prepareTx=function(a,b){var e,f;return a||0===d.length?void i.apply(c.API,[a,b]):void(b&&c.currSlide==c.slideCount-1?(f=d[0],d=d.slice(1),c.container.one("cycle-slide-added",function(a,b){setTimeout(function(){b.API.advanceSlide(1)},50)}),c.API.add(f)):b||0!==c.currSlide?i.apply(c.API,[a,b]):(e=d.length-1,f=d[e],d=d.slice(0,e),c.container.one("cycle-slide-added",function(a,b){setTimeout(function(){b.currSlide=1,b.API.advanceSlide(-1)},50)}),c.API.add(f,!0)))}),g&&(f.next=function(){var a=this.opts();if(d.length&&a.currSlide==a.slideCount-1){var b=d[0];d=d.slice(1),a.container.one("cycle-slide-added",function(a,b){g.apply(b.API),b.container.removeClass("cycle-loading")}),a.container.addClass("cycle-loading"),a.API.add(b)}else g.apply(a.API)}),h&&(f.prev=function(){var a=this.opts();if(d.length&&0===a.currSlide){var b=d.length-1,c=d[b];d=d.slice(0,b),a.container.one("cycle-slide-added",function(a,b){b.currSlide=1,b.API.advanceSlide(-1),b.container.removeClass("cycle-loading")}),a.container.addClass("cycle-loading"),a.API.add(c,!0)}else h.apply(a.API)})}})}(jQuery); \ No newline at end of file +/* Plugin for Cycle2; Copyright (c) 2012 M. Alsup; 20260120 */ +!function(e){"use strict";e.extend(e.fn.cycle.defaults,{progressive:!1}),e(document).on("cycle-pre-initialize",(function(i,n){if(n.progressive){var r,l,c=n.API,t=c.next,s=c.prev,a=c.prepareTx,d=typeof n.progressive;if("array"==d)r=n.progressive;else if("function"==typeof n.progressive)r=n.progressive(n);else if("string"==d){if(l=e(n.progressive),!(r=e.trim(l.html())))return;if(/^(\[)/.test(r))try{""!=r&&(r=JSON.parse(r))}catch(e){return void c.log("error parsing progressive slides",e)}else(r=r.split(new RegExp(l.data("cycle-split")||"\n")))[r.length-1]||r.pop()}a&&(c.prepareTx=function(e,i){var l,c;e||0===r.length?a.apply(n.API,[e,i]):i&&n.currSlide==n.slideCount-1?(c=r[0],r=r.slice(1),n.container.one("cycle-slide-added",(function(e,i){setTimeout((function(){i.API.advanceSlide(1)}),50)})),n.API.add(c)):i||0!==n.currSlide?a.apply(n.API,[e,i]):(l=r.length-1,c=r[l],r=r.slice(0,l),n.container.one("cycle-slide-added",(function(e,i){setTimeout((function(){i.currSlide=1,i.API.advanceSlide(-1)}),50)})),n.API.add(c,!0))}),t&&(c.next=function(){var e=this.opts();if(r.length&&e.currSlide==e.slideCount-1){var i=r[0];r=r.slice(1),e.container.one("cycle-slide-added",(function(e,i){t.apply(i.API),i.container.removeClass("cycle-loading")})),e.container.addClass("cycle-loading"),e.API.add(i)}else t.apply(e.API)}),s&&(c.prev=function(){var e=this.opts();if(r.length&&0===e.currSlide){var i=r.length-1,n=r[i];r=r.slice(0,i),e.container.one("cycle-slide-added",(function(e,i){i.currSlide=1,i.API.advanceSlide(-1),i.container.removeClass("cycle-loading")})),e.container.addClass("cycle-loading"),e.API.add(n,!0)}else s.apply(e.API)})}}))}(jQuery); \ No newline at end of file diff --git a/build/core/jquery.cycle2.tmpl.min.js b/build/core/jquery.cycle2.tmpl.min.js index a99132de..b3d82724 100644 --- a/build/core/jquery.cycle2.tmpl.min.js +++ b/build/core/jquery.cycle2.tmpl.min.js @@ -1,2 +1,2 @@ -/* Plugin for Cycle2; Copyright (c) 2012 M. Alsup; v20141007 */ -!function(a){"use strict";a.extend(a.fn.cycle.defaults,{tmplRegex:"{{((.)?.*?)}}"}),a.extend(a.fn.cycle.API,{tmpl:function(b,c){var d=new RegExp(c.tmplRegex||a.fn.cycle.defaults.tmplRegex,"g"),e=a.makeArray(arguments);return e.shift(),b.replace(d,function(b,c){var d,f,g,h,i=c.split(".");for(d=0;d1)for(h=g,f=0;f1)for(u=r,l=0;l= 0 ) ) { + else if ( autoHeight === 'calc' || ( typeof autoHeight === 'number' && autoHeight >= 0 ) ) { if ( autoHeight === 'calc' ) sentinelIndex = calcSentinelIndex( e, opts ); else if ( autoHeight >= opts.slides.length ) @@ -873,11 +882,11 @@ $.fn.cycle = function( options ) { var cmd, cmdFn, opts; var args = $.makeArray( arguments ); - if ( $.type( options ) == 'number' ) { + if ( typeof options === 'number' ) { return this.cycle( 'goto', options ); } - if ( $.type( options ) == 'string' ) { + if ( typeof options === 'string' ) { return this.each(function() { var cmdArgs; cmd = options; @@ -890,7 +899,7 @@ $.fn.cycle = function( options ) { else { cmd = cmd == 'goto' ? 'jump' : cmd; // issue #3; change 'goto' to 'jump' internally cmdFn = opts.API[ cmd ]; - if ( $.isFunction( cmdFn )) { + if ( typeof cmdFn ==='function') { cmdArgs = $.makeArray( args ); cmdArgs.shift(); return cmdFn.apply( opts.API, cmdArgs ); @@ -939,7 +948,7 @@ $.extend( c2.API, { this.stop(); //#204 var opts = this.opts(); - var clean = $.isFunction( $._data ) ? $._data : $.noop; // hack for #184 and #201 + var clean = (typeof $._data==='function') ? $._data : $.noop; // hack for #184 and #201 clearTimeout(opts.timeoutId); opts.timeoutId = 0; opts.API.stop(); @@ -1014,7 +1023,7 @@ $.extend( c2.API, { slideToRemove = slide; } else { - slides.push( slide ); + [].push.call( slides, slide ); $( slide ).data('cycle.opts').slideNum = slideNum; slideNum++; } @@ -1123,9 +1132,9 @@ $(document).on( 'cycle-bootstrap', function( e, opts ) { function add( slides, prepend ) { var slideArr = []; - if ( $.type( slides ) == 'string' ) + if ( typeof slides === 'string' ) slides = $.trim( slides ); - else if ( $.type( slides) === 'array' ) { + else if ( typeof slides === 'array' ) { for (var i=0; i < slides.length; i++ ) slides[i] = $(slides[i])[0]; } @@ -1145,7 +1154,7 @@ $(document).on( 'cycle-bootstrap', function( e, opts ) { images = images.filter(':not(.cycle-loader-ignore)').filter(':not([src=""])'); if ( ! images.length ) { --slideCount; - slideArr.push( slide ); + [].push.call( slideArr, slide ); return; } @@ -1156,7 +1165,7 @@ $(document).on( 'cycle-bootstrap', function( e, opts ) { imageLoaded(); } else { - $(this).load(function() { + $(this).on("load", function() { imageLoaded(); }).on("error", function() { if ( --count === 0 ) { @@ -1185,10 +1194,10 @@ $(document).on( 'cycle-bootstrap', function( e, opts ) { function addSlide( slide ) { var curr; if ( opts.loader == 'wait' ) { - slideArr.push( slide ); + [].push.call( slideArr, slide ); if ( slideCount === 0 ) { // #59; sort slides into original markup order - slideArr.sort( sorter ); + [].sort.call(slideArr, sorter ); addFn.apply( opts.API, [ slideArr, prepend ] ); opts.container.removeClass('cycle-loading'); } @@ -1389,13 +1398,13 @@ $(document).on( 'cycle-pre-initialize', function( e, opts ) { var nextFn = API.next; var prevFn = API.prev; var prepareTxFn = API.prepareTx; - var type = $.type( opts.progressive ); + var type = typeof opts.progressive; var slides, scriptEl; if ( type == 'array' ) { slides = opts.progressive; } - else if ($.isFunction( opts.progressive ) ) { + else if (typeof opts.progressive==='function' ) { slides = opts.progressive( opts ); } else if ( type == 'string' ) { @@ -1406,7 +1415,7 @@ $(document).on( 'cycle-pre-initialize', function( e, opts ) { // is it json array? if ( /^(\[)/.test( slides ) ) { try { - slides = $.parseJSON( slides ); + if (slides!='') slides = JSON.parse( slides ); } catch(err) { API.log( 'error parsing progressive slides', err ); @@ -1534,7 +1543,7 @@ $.extend($.fn.cycle.API, { prop = obj[str]; } - if ($.isFunction(prop)) + if (typeof prop==='function') return prop.apply(obj, args); if (prop !== undefined && prop !== null && prop != str) return prop; diff --git a/build/jquery.cycle2.min.js b/build/jquery.cycle2.min.js index ad649bd1..924698d0 100644 --- a/build/jquery.cycle2.min.js +++ b/build/jquery.cycle2.min.js @@ -1,16 +1,24 @@ /*! -* jQuery Cycle2; version: 2.1.6 build: 20141007 +* jQuery Cycle2; version: 2.1.7 build: 20260120 * http://jquery.malsup.com/cycle2/ * Copyright (c) 2014 M. Alsup; Dual licensed: MIT/GPL */ -!function(a){"use strict";function b(a){return(a||"").toLowerCase()}var c="2.1.6";a.fn.cycle=function(c){var d;return 0!==this.length||a.isReady?this.each(function(){var d,e,f,g,h=a(this),i=a.fn.cycle.log;if(!h.data("cycle.opts")){(h.data("cycle-log")===!1||c&&c.log===!1||e&&e.log===!1)&&(i=a.noop),i("--c2 init--"),d=h.data();for(var j in d)d.hasOwnProperty(j)&&/^cycle[A-Z]+/.test(j)&&(g=d[j],f=j.match(/^cycle(.*)/)[1].replace(/^[A-Z]/,b),i(f+":",g,"("+typeof g+")"),d[f]=g);e=a.extend({},a.fn.cycle.defaults,d,c||{}),e.timeoutId=0,e.paused=e.paused||!1,e.container=h,e._maxZ=e.maxZ,e.API=a.extend({_container:h},a.fn.cycle.API),e.API.log=i,e.API.trigger=function(a,b){return e.container.trigger(a,b),e.API},h.data("cycle.opts",e),h.data("cycle.API",e.API),e.API.trigger("cycle-bootstrap",[e,e.API]),e.API.addInitialSlides(),e.API.preInitSlideshow(),e.slides.length&&e.API.initSlideshow()}}):(d={s:this.selector,c:this.context},a.fn.cycle.log("requeuing slideshow (dom not ready)"),a(function(){a(d.s,d.c).cycle(c)}),this)},a.fn.cycle.API={opts:function(){return this._container.data("cycle.opts")},addInitialSlides:function(){var b=this.opts(),c=b.slides;b.slideCount=0,b.slides=a(),c=c.jquery?c:b.container.find(c),b.random&&c.sort(function(){return Math.random()-.5}),b.API.add(c)},preInitSlideshow:function(){var b=this.opts();b.API.trigger("cycle-pre-initialize",[b]);var c=a.fn.cycle.transitions[b.fx];c&&a.isFunction(c.preInit)&&c.preInit(b),b._preInitialized=!0},postInitSlideshow:function(){var b=this.opts();b.API.trigger("cycle-post-initialize",[b]);var c=a.fn.cycle.transitions[b.fx];c&&a.isFunction(c.postInit)&&c.postInit(b)},initSlideshow:function(){var b,c=this.opts(),d=c.container;c.API.calcFirstSlide(),"static"==c.container.css("position")&&c.container.css("position","relative"),a(c.slides[c.currSlide]).css({opacity:1,display:"block",visibility:"visible"}),c.API.stackSlides(c.slides[c.currSlide],c.slides[c.nextSlide],!c.reverse),c.pauseOnHover&&(c.pauseOnHover!==!0&&(d=a(c.pauseOnHover)),d.hover(function(){c.API.pause(!0)},function(){c.API.resume(!0)})),c.timeout&&(b=c.API.getSlideOpts(c.currSlide),c.API.queueTransition(b,b.timeout+c.delay)),c._initialized=!0,c.API.updateView(!0),c.API.trigger("cycle-initialized",[c]),c.API.postInitSlideshow()},pause:function(b){var c=this.opts(),d=c.API.getSlideOpts(),e=c.hoverPaused||c.paused;b?c.hoverPaused=!0:c.paused=!0,e||(c.container.addClass("cycle-paused"),c.API.trigger("cycle-paused",[c]).log("cycle-paused"),d.timeout&&(clearTimeout(c.timeoutId),c.timeoutId=0,c._remainingTimeout-=a.now()-c._lastQueue,(c._remainingTimeout<0||isNaN(c._remainingTimeout))&&(c._remainingTimeout=void 0)))},resume:function(a){var b=this.opts(),c=!b.hoverPaused&&!b.paused;a?b.hoverPaused=!1:b.paused=!1,c||(b.container.removeClass("cycle-paused"),0===b.slides.filter(":animated").length&&b.API.queueTransition(b.API.getSlideOpts(),b._remainingTimeout),b.API.trigger("cycle-resumed",[b,b._remainingTimeout]).log("cycle-resumed"))},add:function(b,c){var d,e=this.opts(),f=e.slideCount,g=!1;"string"==a.type(b)&&(b=a.trim(b)),a(b).each(function(){var b,d=a(this);c?e.container.prepend(d):e.container.append(d),e.slideCount++,b=e.API.buildSlideOpts(d),e.slides=c?a(d).add(e.slides):e.slides.add(d),e.API.initSlide(b,d,--e._maxZ),d.data("cycle.opts",b),e.API.trigger("cycle-slide-added",[e,b,d])}),e.API.updateView(!0),g=e._preInitialized&&2>f&&e.slideCount>=1,g&&(e._initialized?e.timeout&&(d=e.slides.length,e.nextSlide=e.reverse?d-1:1,e.timeoutId||e.API.queueTransition(e)):e.API.initSlideshow())},calcFirstSlide:function(){var a,b=this.opts();a=parseInt(b.startingSlide||0,10),(a>=b.slides.length||0>a)&&(a=0),b.currSlide=a,b.reverse?(b.nextSlide=a-1,b.nextSlide<0&&(b.nextSlide=b.slides.length-1)):(b.nextSlide=a+1,b.nextSlide==b.slides.length&&(b.nextSlide=0))},calcNextSlide:function(){var a,b=this.opts();b.reverse?(a=b.nextSlide-1<0,b.nextSlide=a?b.slideCount-1:b.nextSlide-1,b.currSlide=a?0:b.nextSlide+1):(a=b.nextSlide+1==b.slides.length,b.nextSlide=a?0:b.nextSlide+1,b.currSlide=a?b.slides.length-1:b.nextSlide-1)},calcTx:function(b,c){var d,e=b;return e._tempFx?d=a.fn.cycle.transitions[e._tempFx]:c&&e.manualFx&&(d=a.fn.cycle.transitions[e.manualFx]),d||(d=a.fn.cycle.transitions[e.fx]),e._tempFx=null,this.opts()._tempFx=null,d||(d=a.fn.cycle.transitions.fade,e.API.log('Transition "'+e.fx+'" not found. Using fade.')),d},prepareTx:function(a,b){var c,d,e,f,g,h=this.opts();return h.slideCount<2?void(h.timeoutId=0):(!a||h.busy&&!h.manualTrump||(h.API.stopTransition(),h.busy=!1,clearTimeout(h.timeoutId),h.timeoutId=0),void(h.busy||(0!==h.timeoutId||a)&&(d=h.slides[h.currSlide],e=h.slides[h.nextSlide],f=h.API.getSlideOpts(h.nextSlide),g=h.API.calcTx(f,a),h._tx=g,a&&void 0!==f.manualSpeed&&(f.speed=f.manualSpeed),h.nextSlide!=h.currSlide&&(a||!h.paused&&!h.hoverPaused&&h.timeout)?(h.API.trigger("cycle-before",[f,d,e,b]),g.before&&g.before(f,d,e,b),c=function(){h.busy=!1,h.container.data("cycle.opts")&&(g.after&&g.after(f,d,e,b),h.API.trigger("cycle-after",[f,d,e,b]),h.API.queueTransition(f),h.API.updateView(!0))},h.busy=!0,g.transition?g.transition(f,d,e,b,c):h.API.doTransition(f,d,e,b,c),h.API.calcNextSlide(),h.API.updateView()):h.API.queueTransition(f))))},doTransition:function(b,c,d,e,f){var g=b,h=a(c),i=a(d),j=function(){i.animate(g.animIn||{opacity:1},g.speed,g.easeIn||g.easing,f)};i.css(g.cssBefore||{}),h.animate(g.animOut||{},g.speed,g.easeOut||g.easing,function(){h.css(g.cssAfter||{}),g.sync||j()}),g.sync&&j()},queueTransition:function(b,c){var d=this.opts(),e=void 0!==c?c:b.timeout;return 0===d.nextSlide&&0===--d.loop?(d.API.log("terminating; loop=0"),d.timeout=0,e?setTimeout(function(){d.API.trigger("cycle-finished",[d])},e):d.API.trigger("cycle-finished",[d]),void(d.nextSlide=d.currSlide)):void 0!==d.continueAuto&&(d.continueAuto===!1||a.isFunction(d.continueAuto)&&d.continueAuto()===!1)?(d.API.log("terminating automatic transitions"),d.timeout=0,void(d.timeoutId&&clearTimeout(d.timeoutId))):void(e&&(d._lastQueue=a.now(),void 0===c&&(d._remainingTimeout=b.timeout),d.paused||d.hoverPaused||(d.timeoutId=setTimeout(function(){d.API.prepareTx(!1,!d.reverse)},e))))},stopTransition:function(){var a=this.opts();a.slides.filter(":animated").length&&(a.slides.stop(!1,!0),a.API.trigger("cycle-transition-stopped",[a])),a._tx&&a._tx.stopTransition&&a._tx.stopTransition(a)},advanceSlide:function(a){var b=this.opts();return clearTimeout(b.timeoutId),b.timeoutId=0,b.nextSlide=b.currSlide+a,b.nextSlide<0?b.nextSlide=b.slides.length-1:b.nextSlide>=b.slides.length&&(b.nextSlide=0),b.API.prepareTx(!0,a>=0),!1},buildSlideOpts:function(c){var d,e,f=this.opts(),g=c.data()||{};for(var h in g)g.hasOwnProperty(h)&&/^cycle[A-Z]+/.test(h)&&(d=g[h],e=h.match(/^cycle(.*)/)[1].replace(/^[A-Z]/,b),f.API.log("["+(f.slideCount-1)+"]",e+":",d,"("+typeof d+")"),g[e]=d);g=a.extend({},a.fn.cycle.defaults,f,g),g.slideNum=f.slideCount;try{delete g.API,delete g.slideCount,delete g.currSlide,delete g.nextSlide,delete g.slides}catch(i){}return g},getSlideOpts:function(b){var c=this.opts();void 0===b&&(b=c.currSlide);var d=c.slides[b],e=a(d).data("cycle.opts");return a.extend({},c,e)},initSlide:function(b,c,d){var e=this.opts();c.css(b.slideCss||{}),d>0&&c.css("zIndex",d),isNaN(b.speed)&&(b.speed=a.fx.speeds[b.speed]||a.fx.speeds._default),b.sync||(b.speed=b.speed/2),c.addClass(e.slideClass)},updateView:function(a,b){var c=this.opts();if(c._initialized){var d=c.API.getSlideOpts(),e=c.slides[c.currSlide];!a&&b!==!0&&(c.API.trigger("cycle-update-view-before",[c,d,e]),c.updateView<0)||(c.slideActiveClass&&c.slides.removeClass(c.slideActiveClass).eq(c.currSlide).addClass(c.slideActiveClass),a&&c.hideNonActive&&c.slides.filter(":not(."+c.slideActiveClass+")").css("visibility","hidden"),0===c.updateView&&setTimeout(function(){c.API.trigger("cycle-update-view",[c,d,e,a])},d.speed/(c.sync?2:1)),0!==c.updateView&&c.API.trigger("cycle-update-view",[c,d,e,a]),a&&c.API.trigger("cycle-update-view-after",[c,d,e]))}},getComponent:function(b){var c=this.opts(),d=c[b];return"string"==typeof d?/^\s*[\>|\+|~]/.test(d)?c.container.find(d):a(d):d.jquery?d:a(d)},stackSlides:function(b,c,d){var e=this.opts();b||(b=e.slides[e.currSlide],c=e.slides[e.nextSlide],d=!e.reverse),a(b).css("zIndex",e.maxZ);var f,g=e.maxZ-2,h=e.slideCount;if(d){for(f=e.currSlide+1;h>f;f++)a(e.slides[f]).css("zIndex",g--);for(f=0;f=0;f--)a(e.slides[f]).css("zIndex",g--);for(f=h-1;f>e.currSlide;f--)a(e.slides[f]).css("zIndex",g--)}a(c).css("zIndex",e.maxZ-1)},getSlideIndex:function(a){return this.opts().slides.index(a)}},a.fn.cycle.log=function(){window.console&&console.log&&console.log("[cycle2] "+Array.prototype.join.call(arguments," "))},a.fn.cycle.version=function(){return"Cycle2: "+c},a.fn.cycle.transitions={custom:{},none:{before:function(a,b,c,d){a.API.stackSlides(c,b,d),a.cssBefore={opacity:1,visibility:"visible",display:"block"}}},fade:{before:function(b,c,d,e){var f=b.API.getSlideOpts(b.nextSlide).slideCss||{};b.API.stackSlides(c,d,e),b.cssBefore=a.extend(f,{opacity:0,visibility:"visible",display:"block"}),b.animIn={opacity:1},b.animOut={opacity:0}}},fadeout:{before:function(b,c,d,e){var f=b.API.getSlideOpts(b.nextSlide).slideCss||{};b.API.stackSlides(c,d,e),b.cssBefore=a.extend(f,{opacity:1,visibility:"visible",display:"block"}),b.animOut={opacity:0}}},scrollHorz:{before:function(a,b,c,d){a.API.stackSlides(b,c,d);var e=a.container.css("overflow","hidden").width();a.cssBefore={left:d?e:-e,top:0,opacity:1,visibility:"visible",display:"block"},a.cssAfter={zIndex:a._maxZ-2,left:0},a.animIn={left:0},a.animOut={left:d?-e:e}}}},a.fn.cycle.defaults={allowWrap:!0,autoSelector:".cycle-slideshow[data-cycle-auto-init!=false]",delay:0,easing:null,fx:"fade",hideNonActive:!0,loop:0,manualFx:void 0,manualSpeed:void 0,manualTrump:!0,maxZ:100,pauseOnHover:!1,reverse:!1,slideActiveClass:"cycle-slide-active",slideClass:"cycle-slide",slideCss:{position:"absolute",top:0,left:0},slides:"> img",speed:500,startingSlide:0,sync:!0,timeout:4e3,updateView:0},a(document).ready(function(){a(a.fn.cycle.defaults.autoSelector).cycle()})}(jQuery),/*! Cycle2 autoheight plugin; Copyright (c) M.Alsup, 2012; version: 20130913 */ -function(a){"use strict";function b(b,d){var e,f,g,h=d.autoHeight;if("container"==h)f=a(d.slides[d.currSlide]).outerHeight(),d.container.height(f);else if(d._autoHeightRatio)d.container.height(d.container.width()/d._autoHeightRatio);else if("calc"===h||"number"==a.type(h)&&h>=0){if(g="calc"===h?c(b,d):h>=d.slides.length?0:h,g==d._sentinelIndex)return;d._sentinelIndex=g,d._sentinel&&d._sentinel.remove(),e=a(d.slides[g].cloneNode(!0)),e.removeAttr("id name rel").find("[id],[name],[rel]").removeAttr("id name rel"),e.css({position:"static",visibility:"hidden",display:"block"}).prependTo(d.container).addClass("cycle-sentinel cycle-slide").removeClass("cycle-slide-active"),e.find("*").css("visibility","hidden"),d._sentinel=e}}function c(b,c){var d=0,e=-1;return c.slides.each(function(b){var c=a(this).height();c>e&&(e=c,d=b)}),d}function d(b,c,d,e){var f=a(e).outerHeight();c.container.animate({height:f},c.autoHeightSpeed,c.autoHeightEasing)}function e(c,f){f._autoHeightOnResize&&(a(window).off("resize orientationchange",f._autoHeightOnResize),f._autoHeightOnResize=null),f.container.off("cycle-slide-added cycle-slide-removed",b),f.container.off("cycle-destroyed",e),f.container.off("cycle-before",d),f._sentinel&&(f._sentinel.remove(),f._sentinel=null)}a.extend(a.fn.cycle.defaults,{autoHeight:0,autoHeightSpeed:250,autoHeightEasing:null}),a(document).on("cycle-initialized",function(c,f){function g(){b(c,f)}var h,i=f.autoHeight,j=a.type(i),k=null;("string"===j||"number"===j)&&(f.container.on("cycle-slide-added cycle-slide-removed",b),f.container.on("cycle-destroyed",e),"container"==i?f.container.on("cycle-before",d):"string"===j&&/\d+\:\d+/.test(i)&&(h=i.match(/(\d+)\:(\d+)/),h=h[1]/h[2],f._autoHeightRatio=h),"number"!==j&&(f._autoHeightOnResize=function(){clearTimeout(k),k=setTimeout(g,50)},a(window).on("resize orientationchange",f._autoHeightOnResize)),setTimeout(g,30))})}(jQuery),/*! caption plugin for Cycle2; version: 20130306 */ -function(a){"use strict";a.extend(a.fn.cycle.defaults,{caption:"> .cycle-caption",captionTemplate:"{{slideNum}} / {{slideCount}}",overlay:"> .cycle-overlay",overlayTemplate:"
{{title}}
{{desc}}
",captionModule:"caption"}),a(document).on("cycle-update-view",function(b,c,d,e){if("caption"===c.captionModule){a.each(["caption","overlay"],function(){var a=this,b=d[a+"Template"],f=c.API.getComponent(a);f.length&&b?(f.html(c.API.tmpl(b,d,c,e)),f.show()):f.hide()})}}),a(document).on("cycle-destroyed",function(b,c){var d;a.each(["caption","overlay"],function(){var a=this,b=c[a+"Template"];c[a]&&b&&(d=c.API.getComponent("caption"),d.empty())})})}(jQuery),/*! command plugin for Cycle2; version: 20140415 */ -function(a){"use strict";var b=a.fn.cycle;a.fn.cycle=function(c){var d,e,f,g=a.makeArray(arguments);return"number"==a.type(c)?this.cycle("goto",c):"string"==a.type(c)?this.each(function(){var h;return d=c,f=a(this).data("cycle.opts"),void 0===f?void b.log('slideshow must be initialized before sending commands; "'+d+'" ignored'):(d="goto"==d?"jump":d,e=f.API[d],a.isFunction(e)?(h=a.makeArray(g),h.shift(),e.apply(f.API,h)):void b.log("unknown command: ",d))}):b.apply(this,arguments)},a.extend(a.fn.cycle,b),a.extend(b.API,{next:function(){var a=this.opts();if(!a.busy||a.manualTrump){var b=a.reverse?-1:1;a.allowWrap===!1&&a.currSlide+b>=a.slideCount||(a.API.advanceSlide(b),a.API.trigger("cycle-next",[a]).log("cycle-next"))}},prev:function(){var a=this.opts();if(!a.busy||a.manualTrump){var b=a.reverse?1:-1;a.allowWrap===!1&&a.currSlide+b<0||(a.API.advanceSlide(b),a.API.trigger("cycle-prev",[a]).log("cycle-prev"))}},destroy:function(){this.stop();var b=this.opts(),c=a.isFunction(a._data)?a._data:a.noop;clearTimeout(b.timeoutId),b.timeoutId=0,b.API.stop(),b.API.trigger("cycle-destroyed",[b]).log("cycle-destroyed"),b.container.removeData(),c(b.container[0],"parsedAttrs",!1),b.retainStylesOnDestroy||(b.container.removeAttr("style"),b.slides.removeAttr("style"),b.slides.removeClass(b.slideActiveClass)),b.slides.each(function(){var d=a(this);d.removeData(),d.removeClass(b.slideClass),c(this,"parsedAttrs",!1)})},jump:function(a,b){var c,d=this.opts();if(!d.busy||d.manualTrump){var e=parseInt(a,10);if(isNaN(e)||0>e||e>=d.slides.length)return void d.API.log("goto: invalid slide index: "+e);if(e==d.currSlide)return void d.API.log("goto: skipping, already on slide",e);d.nextSlide=e,clearTimeout(d.timeoutId),d.timeoutId=0,d.API.log("goto: ",e," (zero-index)"),c=d.currSlide .cycle-pager",pagerActiveClass:"cycle-pager-active",pagerEvent:"click.cycle",pagerEventBubble:void 0,pagerTemplate:"•"}),a(document).on("cycle-bootstrap",function(a,c,d){d.buildPagerLink=b}),a(document).on("cycle-slide-added",function(a,b,d,e){b.pager&&(b.API.buildPagerLink(b,d,e),b.API.page=c)}),a(document).on("cycle-slide-removed",function(b,c,d){if(c.pager){var e=c.API.getComponent("pager");e.each(function(){var b=a(this);a(b.children()[d]).remove()})}}),a(document).on("cycle-update-view",function(b,c){var d;c.pager&&(d=c.API.getComponent("pager"),d.each(function(){a(this).children().removeClass(c.pagerActiveClass).eq(c.currSlide).addClass(c.pagerActiveClass)}))}),a(document).on("cycle-destroyed",function(a,b){var c=b.API.getComponent("pager");c&&(c.children().off(b.pagerEvent),b.pagerTemplate&&c.empty())})}(jQuery),/*! prevnext plugin for Cycle2; version: 20140408 */ -function(a){"use strict";a.extend(a.fn.cycle.defaults,{next:"> .cycle-next",nextEvent:"click.cycle",disabledClass:"disabled",prev:"> .cycle-prev",prevEvent:"click.cycle",swipe:!1}),a(document).on("cycle-initialized",function(a,b){if(b.API.getComponent("next").on(b.nextEvent,function(a){a.preventDefault(),b.API.next()}),b.API.getComponent("prev").on(b.prevEvent,function(a){a.preventDefault(),b.API.prev()}),b.swipe){var c=b.swipeVert?"swipeUp.cycle":"swipeLeft.cycle swipeleft.cycle",d=b.swipeVert?"swipeDown.cycle":"swipeRight.cycle swiperight.cycle";b.container.on(c,function(){b._tempFx=b.swipeFx,b.API.next()}),b.container.on(d,function(){b._tempFx=b.swipeFx,b.API.prev()})}}),a(document).on("cycle-update-view",function(a,b){if(!b.allowWrap){var c=b.disabledClass,d=b.API.getComponent("next"),e=b.API.getComponent("prev"),f=b._prevBoundry||0,g=void 0!==b._nextBoundry?b._nextBoundry:b.slideCount-1;b.currSlide==g?d.addClass(c).prop("disabled",!0):d.removeClass(c).prop("disabled",!1),b.currSlide===f?e.addClass(c).prop("disabled",!0):e.removeClass(c).prop("disabled",!1)}}),a(document).on("cycle-destroyed",function(a,b){b.API.getComponent("prev").off(b.nextEvent),b.API.getComponent("next").off(b.prevEvent),b.container.off("swipeleft.cycle swiperight.cycle swipeLeft.cycle swipeRight.cycle swipeUp.cycle swipeDown.cycle")})}(jQuery),/*! progressive loader plugin for Cycle2; version: 20130315 */ -function(a){"use strict";a.extend(a.fn.cycle.defaults,{progressive:!1}),a(document).on("cycle-pre-initialize",function(b,c){if(c.progressive){var d,e,f=c.API,g=f.next,h=f.prev,i=f.prepareTx,j=a.type(c.progressive);if("array"==j)d=c.progressive;else if(a.isFunction(c.progressive))d=c.progressive(c);else if("string"==j){if(e=a(c.progressive),d=a.trim(e.html()),!d)return;if(/^(\[)/.test(d))try{d=a.parseJSON(d)}catch(k){return void f.log("error parsing progressive slides",k)}else d=d.split(new RegExp(e.data("cycle-split")||"\n")),d[d.length-1]||d.pop()}i&&(f.prepareTx=function(a,b){var e,f;return a||0===d.length?void i.apply(c.API,[a,b]):void(b&&c.currSlide==c.slideCount-1?(f=d[0],d=d.slice(1),c.container.one("cycle-slide-added",function(a,b){setTimeout(function(){b.API.advanceSlide(1)},50)}),c.API.add(f)):b||0!==c.currSlide?i.apply(c.API,[a,b]):(e=d.length-1,f=d[e],d=d.slice(0,e),c.container.one("cycle-slide-added",function(a,b){setTimeout(function(){b.currSlide=1,b.API.advanceSlide(-1)},50)}),c.API.add(f,!0)))}),g&&(f.next=function(){var a=this.opts();if(d.length&&a.currSlide==a.slideCount-1){var b=d[0];d=d.slice(1),a.container.one("cycle-slide-added",function(a,b){g.apply(b.API),b.container.removeClass("cycle-loading")}),a.container.addClass("cycle-loading"),a.API.add(b)}else g.apply(a.API)}),h&&(f.prev=function(){var a=this.opts();if(d.length&&0===a.currSlide){var b=d.length-1,c=d[b];d=d.slice(0,b),a.container.one("cycle-slide-added",function(a,b){b.currSlide=1,b.API.advanceSlide(-1),b.container.removeClass("cycle-loading")}),a.container.addClass("cycle-loading"),a.API.add(c,!0)}else h.apply(a.API)})}})}(jQuery),/*! tmpl plugin for Cycle2; version: 20121227 */ -function(a){"use strict";a.extend(a.fn.cycle.defaults,{tmplRegex:"{{((.)?.*?)}}"}),a.extend(a.fn.cycle.API,{tmpl:function(b,c){var d=new RegExp(c.tmplRegex||a.fn.cycle.defaults.tmplRegex,"g"),e=a.makeArray(arguments);return e.shift(),b.replace(d,function(b,c){var d,f,g,h,i=c.split(".");for(d=0;d1)for(h=g,f=0;f=1&&(o._initialized?o.timeout&&(n=o.slides.length,o.nextSlide=o.reverse?n-1:1,o.timeoutId||o.API.queueTransition(o)):o.API.initSlideshow())},calcFirstSlide:function(){var e,t=this.opts();((e=parseInt(t.startingSlide||0,10))>=t.slides.length||e<0)&&(e=0),t.currSlide=e,t.reverse?(t.nextSlide=e-1,t.nextSlide<0&&(t.nextSlide=t.slides.length-1)):(t.nextSlide=e+1,t.nextSlide==t.slides.length&&(t.nextSlide=0))},calcNextSlide:function(){var e,t=this.opts();t.reverse?(e=t.nextSlide-1<0,t.nextSlide=e?t.slideCount-1:t.nextSlide-1,t.currSlide=e?0:t.nextSlide+1):(e=t.nextSlide+1==t.slides.length,t.nextSlide=e?0:t.nextSlide+1,t.currSlide=e?t.slides.length-1:t.nextSlide-1)},calcTx:function(t,i){var n,o=t;return o._tempFx?n=e.fn.cycle.transitions[o._tempFx]:i&&o.manualFx&&(n=e.fn.cycle.transitions[o.manualFx]),n||(n=e.fn.cycle.transitions[o.fx]),o._tempFx=null,this.opts()._tempFx=null,n||(n=e.fn.cycle.transitions.fade,o.API.log('Transition "'+o.fx+'" not found. Using fade.')),n},prepareTx:function(e,t){var i,n,o,s,l,c=this.opts();c.slideCount<2?c.timeoutId=0:(!e||c.busy&&!c.manualTrump||(c.API.stopTransition(),c.busy=!1,clearTimeout(c.timeoutId),c.timeoutId=0),c.busy||(0!==c.timeoutId||e)&&(n=c.slides[c.currSlide],o=c.slides[c.nextSlide],s=c.API.getSlideOpts(c.nextSlide),l=c.API.calcTx(s,e),c._tx=l,e&&void 0!==s.manualSpeed&&(s.speed=s.manualSpeed),c.nextSlide!=c.currSlide&&(e||!c.paused&&!c.hoverPaused&&c.timeout)?(c.API.trigger("cycle-before",[s,n,o,t]),l.before&&l.before(s,n,o,t),i=function(){c.busy=!1,c.container.data("cycle.opts")&&(l.after&&l.after(s,n,o,t),c.API.trigger("cycle-after",[s,n,o,t]),c.API.queueTransition(s),c.API.updateView(!0))},c.busy=!0,l.transition?l.transition(s,n,o,t,i):c.API.doTransition(s,n,o,t,i),c.API.calcNextSlide(),c.API.updateView()):c.API.queueTransition(s)))},doTransition:function(t,i,n,o,s){var l=t,c=e(i),a=e(n),r=function(){a.animate(l.animIn||{opacity:1},l.speed,l.easeIn||l.easing,s)};a.css(l.cssBefore||{}),c.animate(l.animOut||{},l.speed,l.easeOut||l.easing,(function(){c.css(l.cssAfter||{}),l.sync||r()})),l.sync&&r()},queueTransition:function(e,t){var i=this.opts(),n=void 0!==t?t:e.timeout;return 0===i.nextSlide&&0==--i.loop?(i.API.log("terminating; loop=0"),i.timeout=0,n?setTimeout((function(){i.API.trigger("cycle-finished",[i])}),n):i.API.trigger("cycle-finished",[i]),void(i.nextSlide=i.currSlide)):void 0!==i.continueAuto&&(!1===i.continueAuto||"function"==typeof i.continueAuto&&!1===i.continueAuto())?(i.API.log("terminating automatic transitions"),i.timeout=0,void(i.timeoutId&&clearTimeout(i.timeoutId))):void(n&&(i._lastQueue=Date.now(),void 0===t&&(i._remainingTimeout=e.timeout),i.paused||i.hoverPaused||(i.timeoutId=setTimeout((function(){i.API.prepareTx(!1,!i.reverse)}),n))))},stopTransition:function(){var e=this.opts();e.slides.filter(":animated").length&&(e.slides.stop(!1,!0),e.API.trigger("cycle-transition-stopped",[e])),e._tx&&e._tx.stopTransition&&e._tx.stopTransition(e)},advanceSlide:function(e){var t=this.opts();return clearTimeout(t.timeoutId),t.timeoutId=0,t.nextSlide=t.currSlide+e,t.nextSlide<0?t.nextSlide=t.slides.length-1:t.nextSlide>=t.slides.length&&(t.nextSlide=0),t.API.prepareTx(!0,e>=0),!1},buildSlideOpts:function(i){var n,o,s=this.opts(),l=e.extend({},i.data()||{});for(var c in l)l.hasOwnProperty(c)&&/^cycle[A-Z]+/.test(c)&&(n=l[c],o=c.match(/^cycle(.*)/)[1].replace(/^[A-Z]/,t),s.API.log("["+(s.slideCount-1)+"]",o+":",n,"("+typeof n+")"),l[o]=n);(l=e.extend({},e.fn.cycle.defaults,s,l)).slideNum=s.slideCount;try{delete l.API,delete l.slideCount,delete l.currSlide,delete l.nextSlide,delete l.slides}catch(e){}return l},getSlideOpts:function(t){var i=this.opts();void 0===t&&(t=i.currSlide);var n=i.slides[t],o=e(n).data("cycle.opts");return e.extend({},i,o)},initSlide:function(t,i,n){var o=this.opts();i.css(t.slideCss||{}),n>0&&i.css("zIndex",n),isNaN(t.speed)&&(t.speed=e.fx.speeds[t.speed]||e.fx.speeds._default),t.sync||(t.speed=t.speed/2),i.addClass(o.slideClass)},updateView:function(e,t,i){var n=this.opts();if(n._initialized){var o=n.API.getSlideOpts(),s=n.slides[n.currSlide];!e&&!0!==t&&(n.API.trigger("cycle-update-view-before",[n,o,s]),n.updateView<0)||(n.slideActiveClass&&n.slides.removeClass(n.slideActiveClass).eq(n.currSlide).addClass(n.slideActiveClass),e&&n.hideNonActive&&n.slides.filter(":not(."+n.slideActiveClass+")").css("visibility","hidden"),0===n.updateView&&setTimeout((function(){n.API.trigger("cycle-update-view",[n,o,s,e])}),o.speed/(n.sync?2:1)),0!==n.updateView&&n.API.trigger("cycle-update-view",[n,o,s,e]),e&&n.API.trigger("cycle-update-view-after",[n,o,s]))}},getComponent:function(t){var i=this.opts(),n=i[t];return"string"==typeof n?/^\s*[\>|\+|~]/.test(n)?i.container.find(n):e(n):n.jquery?n:e(n)},stackSlides:function(t,i,n){var o,s=this.opts();t||(t=s.slides[s.currSlide],i=s.slides[s.nextSlide],n=!s.reverse),e(t).css("zIndex",s.maxZ);var l=s.maxZ-2,c=s.slideCount;if(n){for(o=s.currSlide+1;o=0;o--)e(s.slides[o]).css("zIndex",l--);for(o=c-1;o>s.currSlide;o--)e(s.slides[o]).css("zIndex",l--)}e(i).css("zIndex",s.maxZ-1)},getSlideIndex:function(e){return this.opts().slides.index(e)}},e.fn.cycle.log=function(){window.console&&console.log&&console.log("[cycle2] "+Array.prototype.join.call(arguments," "))},e.fn.cycle.version=function(){return"Cycle2: 2.1.7"},e.fn.cycle.transitions={custom:{},none:{before:function(e,t,i,n){e.API.stackSlides(i,t,n),e.cssBefore={opacity:1,visibility:"visible",display:"block"}}},fade:{before:function(t,i,n,o){var s=t.API.getSlideOpts(t.nextSlide).slideCss||{};t.API.stackSlides(i,n,o),t.cssBefore=e.extend(s,{opacity:0,visibility:"visible",display:"block"}),t.animIn={opacity:1},t.animOut={opacity:0}}},fadeout:{before:function(t,i,n,o){var s=t.API.getSlideOpts(t.nextSlide).slideCss||{};t.API.stackSlides(i,n,o),t.cssBefore=e.extend(s,{opacity:1,visibility:"visible",display:"block"}),t.animOut={opacity:0}}},scrollHorz:{before:function(e,t,i,n){e.API.stackSlides(t,i,n);var o=e.container.css("overflow","hidden").width();e.cssBefore={left:n?o:-o,top:0,opacity:1,visibility:"visible",display:"block"},e.cssAfter={zIndex:e._maxZ-2,left:0},e.animIn={left:0},e.animOut={left:n?-o:o}}},scrollVert:{before:function(e,t,i,n){e.API.stackSlides(e,t,i,n);var o=e.container.css("overflow","hidden").height();e.cssBefore={top:n?-o:o,left:0,opacity:1,display:"block",visibility:"visible"},e.animIn={top:0},e.animOut={top:n?o:-o}}}},e.fn.cycle.defaults={allowWrap:!0,autoSelector:".cycle-slideshow[data-cycle-auto-init!=false]",delay:0,easing:null,fx:"fade",hideNonActive:!0,loop:0,manualFx:void 0,manualSpeed:void 0,manualTrump:!0,maxZ:100,pauseOnHover:!1,reverse:!1,slideActiveClass:"cycle-slide-active",slideClass:"cycle-slide",slideCss:{position:"absolute",top:0,left:0},slides:"> img",speed:500,startingSlide:0,sync:!0,timeout:4e3,updateView:0},e(document).ready((function(){e(e.fn.cycle.defaults.autoSelector).cycle()}))}(jQuery), +/*! Cycle2 autoheight plugin; Copyright (c) M.Alsup, 2012; version: 20130913 */ +function(e){"use strict";function t(t,i){var n,o,s,l=i.autoHeight;if("container"==l)o=e(i.slides[i.currSlide]).outerHeight(),i.container.height(o);else if(i._autoHeightRatio)i.container.height(i.container.width()/i._autoHeightRatio);else if("calc"===l||"number"==typeof l&&l>=0){if(s="calc"===l?function(t,i){var n=0,o=-1;return i.slides.each((function(t){var i=e(this).height();i>o&&(o=i,n=t)})),n}(0,i):l>=i.slides.length?0:l,s==i._sentinelIndex)return;i._sentinelIndex=s,i._sentinel&&i._sentinel.remove(),(n=e(i.slides[s].cloneNode(!0))).removeAttr("id name rel").find("[id],[name],[rel]").removeAttr("id name rel"),n.css({position:"static",visibility:"hidden",display:"block"}).prependTo(i.container).addClass("cycle-sentinel cycle-slide").removeClass("cycle-slide-active"),n.find("*").css("visibility","hidden"),i._sentinel=n}}function i(t,i,n,o,s){var l=e(o).outerHeight();i.container.animate({height:l},i.autoHeightSpeed,i.autoHeightEasing)}function n(o,s){s._autoHeightOnResize&&(e(window).off("resize orientationchange",s._autoHeightOnResize),s._autoHeightOnResize=null),s.container.off("cycle-slide-added cycle-slide-removed",t),s.container.off("cycle-destroyed",n),s.container.off("cycle-before",i),s._sentinel&&(s._sentinel.remove(),s._sentinel=null)}e.extend(e.fn.cycle.defaults,{autoHeight:0,autoHeightSpeed:250,autoHeightEasing:null}),e(document).on("cycle-initialized",(function(o,s){var l,c=s.autoHeight,a=typeof c,r=null;function d(){t(o,s)}"string"!==a&&"number"!==a||(s.container.on("cycle-slide-added cycle-slide-removed",t),s.container.on("cycle-destroyed",n),"container"==c?s.container.on("cycle-before",i):"string"===a&&/\d+\:\d+/.test(c)&&(l=(l=c.match(/(\d+)\:(\d+)/))[1]/l[2],s._autoHeightRatio=l),"number"!==a&&(s._autoHeightOnResize=function(){clearTimeout(r),r=setTimeout(d,50)},e(window).on("resize orientationchange",s._autoHeightOnResize)),setTimeout(d,30))}))}(jQuery), +/*! caption plugin for Cycle2; version: 20130306 */ +function(e){"use strict";e.extend(e.fn.cycle.defaults,{caption:"> .cycle-caption",captionTemplate:"{{slideNum}} / {{slideCount}}",overlay:"> .cycle-overlay",overlayTemplate:"
{{title}}
{{desc}}
",captionModule:"caption"}),e(document).on("cycle-update-view",(function(t,i,n,o){"caption"===i.captionModule&&e.each(["caption","overlay"],(function(){var e=n[this+"Template"],t=i.API.getComponent(this);t.length&&e?(t.html(i.API.tmpl(e,n,i,o)),t.show()):t.hide()}))})),e(document).on("cycle-destroyed",(function(t,i){e.each(["caption","overlay"],(function(){var e=i[this+"Template"];i[this]&&e&&i.API.getComponent("caption").empty()}))}))}(jQuery), +/*! command plugin for Cycle2; version: 20140415 */ +function(e){"use strict";var t=e.fn.cycle;e.fn.cycle=function(i){var n,o,s,l=e.makeArray(arguments);return"number"==typeof i?this.cycle("goto",i):"string"==typeof i?this.each((function(){var c;if(n=i,void 0!==(s=e(this).data("cycle.opts")))return n="goto"==n?"jump":n,"function"==typeof(o=s.API[n])?((c=e.makeArray(l)).shift(),o.apply(s.API,c)):void t.log("unknown command: ",n);t.log('slideshow must be initialized before sending commands; "'+n+'" ignored')})):t.apply(this,arguments)},e.extend(e.fn.cycle,t),e.extend(t.API,{next:function(){var e=this.opts();if(!e.busy||e.manualTrump){var t=e.reverse?-1:1;!1===e.allowWrap&&e.currSlide+t>=e.slideCount||(e.API.advanceSlide(t),e.API.trigger("cycle-next",[e]).log("cycle-next"))}},prev:function(){var e=this.opts();if(!e.busy||e.manualTrump){var t=e.reverse?1:-1;!1===e.allowWrap&&e.currSlide+t<0||(e.API.advanceSlide(t),e.API.trigger("cycle-prev",[e]).log("cycle-prev"))}},destroy:function(){this.stop();var t=this.opts(),i="function"==typeof e._data?e._data:e.noop;clearTimeout(t.timeoutId),t.timeoutId=0,t.API.stop(),t.API.trigger("cycle-destroyed",[t]).log("cycle-destroyed"),t.container.removeData(),i(t.container[0],"parsedAttrs",!1),t.retainStylesOnDestroy||(t.container.removeAttr("style"),t.slides.removeAttr("style"),t.slides.removeClass(t.slideActiveClass)),t.slides.each((function(){var n=e(this);n.removeData(),n.removeClass(t.slideClass),i(this,"parsedAttrs",!1)}))},jump:function(e,t){var i,n=this.opts();if(!n.busy||n.manualTrump){var o=parseInt(e,10);isNaN(o)||o<0||o>=n.slides.length?n.API.log("goto: invalid slide index: "+o):o!=n.currSlide?(n.nextSlide=o,clearTimeout(n.timeoutId),n.timeoutId=0,n.API.log("goto: ",o," (zero-index)"),i=n.currSlide .cycle-pager",pagerActiveClass:"cycle-pager-active",pagerEvent:"click.cycle",pagerEventBubble:void 0,pagerTemplate:"•"}),e(document).on("cycle-bootstrap",(function(e,i,n){n.buildPagerLink=t})),e(document).on("cycle-slide-added",(function(e,t,n,o){t.pager&&(t.API.buildPagerLink(t,n,o),t.API.page=i)})),e(document).on("cycle-slide-removed",(function(t,i,n,o){i.pager&&i.API.getComponent("pager").each((function(){var t=e(this);e(t.children()[n]).remove()}))})),e(document).on("cycle-update-view",(function(t,i,n){i.pager&&i.API.getComponent("pager").each((function(){e(this).children().removeClass(i.pagerActiveClass).eq(i.currSlide).addClass(i.pagerActiveClass)}))})),e(document).on("cycle-destroyed",(function(e,t){var i=t.API.getComponent("pager");i&&(i.children().off(t.pagerEvent),t.pagerTemplate&&i.empty())}))}(jQuery), +/*! prevnext plugin for Cycle2; version: 20140408 */ +function(e){"use strict";e.extend(e.fn.cycle.defaults,{next:"> .cycle-next",nextEvent:"click.cycle",disabledClass:"disabled",prev:"> .cycle-prev",prevEvent:"click.cycle",swipe:!1}),e(document).on("cycle-initialized",(function(e,t){if(t.API.getComponent("next").on(t.nextEvent,(function(e){e.preventDefault(),t.API.next()})),t.API.getComponent("prev").on(t.prevEvent,(function(e){e.preventDefault(),t.API.prev()})),t.swipe){var i=t.swipeVert?"swipeUp.cycle":"swipeLeft.cycle swipeleft.cycle",n=t.swipeVert?"swipeDown.cycle":"swipeRight.cycle swiperight.cycle";t.container.on(i,(function(e){t._tempFx=t.swipeFx,t.API.next()})),t.container.on(n,(function(){t._tempFx=t.swipeFx,t.API.prev()}))}})),e(document).on("cycle-update-view",(function(e,t,i,n){if(!t.allowWrap){var o=t.disabledClass,s=t.API.getComponent("next"),l=t.API.getComponent("prev"),c=t._prevBoundry||0,a=void 0!==t._nextBoundry?t._nextBoundry:t.slideCount-1;t.currSlide==a?s.addClass(o).prop("disabled",!0):s.removeClass(o).prop("disabled",!1),t.currSlide===c?l.addClass(o).prop("disabled",!0):l.removeClass(o).prop("disabled",!1)}})),e(document).on("cycle-destroyed",(function(e,t){t.API.getComponent("prev").off(t.nextEvent),t.API.getComponent("next").off(t.prevEvent),t.container.off("swipeleft.cycle swiperight.cycle swipeLeft.cycle swipeRight.cycle swipeUp.cycle swipeDown.cycle")}))}(jQuery), +/*! progressive loader plugin for Cycle2; version: 20130315 */ +function(e){"use strict";e.extend(e.fn.cycle.defaults,{progressive:!1}),e(document).on("cycle-pre-initialize",(function(t,i){if(i.progressive){var n,o,s=i.API,l=s.next,c=s.prev,a=s.prepareTx,r=typeof i.progressive;if("array"==r)n=i.progressive;else if("function"==typeof i.progressive)n=i.progressive(i);else if("string"==r){if(o=e(i.progressive),!(n=e.trim(o.html())))return;if(/^(\[)/.test(n))try{""!=n&&(n=JSON.parse(n))}catch(e){return void s.log("error parsing progressive slides",e)}else(n=n.split(new RegExp(o.data("cycle-split")||"\n")))[n.length-1]||n.pop()}a&&(s.prepareTx=function(e,t){var o,s;e||0===n.length?a.apply(i.API,[e,t]):t&&i.currSlide==i.slideCount-1?(s=n[0],n=n.slice(1),i.container.one("cycle-slide-added",(function(e,t){setTimeout((function(){t.API.advanceSlide(1)}),50)})),i.API.add(s)):t||0!==i.currSlide?a.apply(i.API,[e,t]):(o=n.length-1,s=n[o],n=n.slice(0,o),i.container.one("cycle-slide-added",(function(e,t){setTimeout((function(){t.currSlide=1,t.API.advanceSlide(-1)}),50)})),i.API.add(s,!0))}),l&&(s.next=function(){var e=this.opts();if(n.length&&e.currSlide==e.slideCount-1){var t=n[0];n=n.slice(1),e.container.one("cycle-slide-added",(function(e,t){l.apply(t.API),t.container.removeClass("cycle-loading")})),e.container.addClass("cycle-loading"),e.API.add(t)}else l.apply(e.API)}),c&&(s.prev=function(){var e=this.opts();if(n.length&&0===e.currSlide){var t=n.length-1,i=n[t];n=n.slice(0,t),e.container.one("cycle-slide-added",(function(e,t){t.currSlide=1,t.API.advanceSlide(-1),t.container.removeClass("cycle-loading")})),e.container.addClass("cycle-loading"),e.API.add(i,!0)}else c.apply(e.API)})}}))}(jQuery), +/*! tmpl plugin for Cycle2; version: 20121227 */ +function(e){"use strict";e.extend(e.fn.cycle.defaults,{tmplRegex:"{{((.)?.*?)}}"}),e.extend(e.fn.cycle.API,{tmpl:function(t,i){var n=new RegExp(i.tmplRegex||e.fn.cycle.defaults.tmplRegex,"g"),o=e.makeArray(arguments);return o.shift(),t.replace(n,(function(e,t){var i,n,s,l,c=t.split(".");for(i=0;i1)for(l=s,n=0;n= 0.6.0" diff --git a/src/jquery.cycle2.autoheight.js b/src/jquery.cycle2.autoheight.js index f7615a8f..169c1664 100644 --- a/src/jquery.cycle2.autoheight.js +++ b/src/jquery.cycle2.autoheight.js @@ -1,4 +1,4 @@ -/*! Cycle2 autoheight plugin; Copyright (c) M.Alsup, 2012; version: 20130913 */ +/*! Cycle2 autoheight plugin; Copyright (c) M.Alsup, 2012; version: 20260120 */ (function($) { "use strict"; @@ -10,7 +10,7 @@ $.extend($.fn.cycle.defaults, { $(document).on( 'cycle-initialized', function( e, opts ) { var autoHeight = opts.autoHeight; - var t = $.type( autoHeight ); + var t = typeof autoHeight; var resizeThrottle = null; var ratio; @@ -61,7 +61,7 @@ function initAutoHeight( e, opts ) { else if ( opts._autoHeightRatio ) { opts.container.height( opts.container.width() / opts._autoHeightRatio ); } - else if ( autoHeight === 'calc' || ( $.type( autoHeight ) == 'number' && autoHeight >= 0 ) ) { + else if ( autoHeight === 'calc' || ( typeof autoHeight === 'number' && autoHeight >= 0 ) ) { if ( autoHeight === 'calc' ) sentinelIndex = calcSentinelIndex( e, opts ); else if ( autoHeight >= opts.slides.length ) diff --git a/src/jquery.cycle2.caption.js b/src/jquery.cycle2.caption.js index 41cb747e..97dc7b41 100644 --- a/src/jquery.cycle2.caption.js +++ b/src/jquery.cycle2.caption.js @@ -1,4 +1,4 @@ -/*! caption plugin for Cycle2; version: 20130306 */ +/*! caption plugin for Cycle2; version: 20260120 */ (function($) { "use strict"; diff --git a/src/jquery.cycle2.command.js b/src/jquery.cycle2.command.js index 9600dc93..16e28104 100644 --- a/src/jquery.cycle2.command.js +++ b/src/jquery.cycle2.command.js @@ -1,4 +1,4 @@ -/*! command plugin for Cycle2; version: 20140415 */ +/*! command plugin for Cycle2; version: 20260120 */ (function($) { "use strict"; @@ -8,11 +8,11 @@ $.fn.cycle = function( options ) { var cmd, cmdFn, opts; var args = $.makeArray( arguments ); - if ( $.type( options ) == 'number' ) { + if ( typeof options === 'number' ) { return this.cycle( 'goto', options ); } - if ( $.type( options ) == 'string' ) { + if ( typeof options === 'string' ) { return this.each(function() { var cmdArgs; cmd = options; @@ -25,7 +25,7 @@ $.fn.cycle = function( options ) { else { cmd = cmd == 'goto' ? 'jump' : cmd; // issue #3; change 'goto' to 'jump' internally cmdFn = opts.API[ cmd ]; - if ( $.isFunction( cmdFn )) { + if ( typeof cmdFn ==='function') { cmdArgs = $.makeArray( args ); cmdArgs.shift(); return cmdFn.apply( opts.API, cmdArgs ); @@ -74,7 +74,7 @@ $.extend( c2.API, { this.stop(); //#204 var opts = this.opts(); - var clean = $.isFunction( $._data ) ? $._data : $.noop; // hack for #184 and #201 + var clean = (typeof $._data==='function') ? $._data : $.noop; // hack for #184 and #201 clearTimeout(opts.timeoutId); opts.timeoutId = 0; opts.API.stop(); @@ -149,7 +149,7 @@ $.extend( c2.API, { slideToRemove = slide; } else { - slides.push( slide ); + [].push.call( slides, slide ); $( slide ).data('cycle.opts').slideNum = slideNum; slideNum++; } diff --git a/src/jquery.cycle2.core.js b/src/jquery.cycle2.core.js index d829e3cb..0e9d0cbf 100755 --- a/src/jquery.cycle2.core.js +++ b/src/jquery.cycle2.core.js @@ -2,7 +2,7 @@ ;(function($) { "use strict"; -var version = '2.1.6'; +var version = '2.1.7'; $.fn.cycle = function( options ) { // fix mistakes with the ready state @@ -31,7 +31,7 @@ $.fn.cycle = function( options ) { } log('--c2 init--'); - data = container.data(); + data = $.extend({}, container.data() || {}); for (var p in data) { // allow props to be accessed sans 'cycle' prefix and log the overrides if (data.hasOwnProperty(p) && /^cycle[A-Z]+/.test(p) ) { @@ -84,7 +84,7 @@ $.fn.cycle.API = { slides = slides.jquery ? slides : opts.container.find( slides ); if ( opts.random ) { - slides.sort(function() {return Math.random() - 0.5;}); + [].sort.call(slides, function(a, b) { return Math.random() - 0.5; } ); } opts.API.add( slides ); @@ -94,7 +94,7 @@ $.fn.cycle.API = { var opts = this.opts(); opts.API.trigger('cycle-pre-initialize', [ opts ]); var tx = $.fn.cycle.transitions[opts.fx]; - if (tx && $.isFunction(tx.preInit)) + if (tx && typeof tx.preInit==='function') tx.preInit( opts ); opts._preInitialized = true; }, @@ -103,7 +103,7 @@ $.fn.cycle.API = { var opts = this.opts(); opts.API.trigger('cycle-post-initialize', [ opts ]); var tx = $.fn.cycle.transitions[opts.fx]; - if (tx && $.isFunction(tx.postInit)) + if (tx && typeof tx.postInit==='function') tx.postInit( opts ); }, @@ -127,11 +127,11 @@ $.fn.cycle.API = { // allow pauseOnHover to specify an element if ( opts.pauseOnHover !== true ) pauseObj = $( opts.pauseOnHover ); - - pauseObj.hover( - function(){ opts.API.pause( true ); }, - function(){ opts.API.resume( true ); } - ); + pauseObj.on('mouseenter', function() { + opts.API.pause( true ); + }).on('mouseleave', function() { + opts.API.resume( true ); + }); } // stage initial transition @@ -165,7 +165,7 @@ $.fn.cycle.API = { opts.timeoutId = 0; // determine how much time is left for the current slide - opts._remainingTimeout -= ( $.now() - opts._lastQueue ); + opts._remainingTimeout -= ( Date.now() - opts._lastQueue ); if ( opts._remainingTimeout < 0 || isNaN(opts._remainingTimeout) ) opts._remainingTimeout = undefined; } @@ -199,7 +199,7 @@ $.fn.cycle.API = { var startSlideshow = false; var len; - if ( $.type(slides) == 'string') + if ( typeof slides === 'string') slides = $.trim( slides ); $( slides ).each(function(i) { @@ -408,7 +408,7 @@ $.fn.cycle.API = { } if ( opts.continueAuto !== undefined ) { if ( opts.continueAuto === false || - ($.isFunction(opts.continueAuto) && opts.continueAuto() === false )) { + (typeof opts.continueAuto==='function' && opts.continueAuto() === false )) { opts.API.log('terminating automatic transitions'); opts.timeout = 0; if ( opts.timeoutId ) @@ -417,7 +417,7 @@ $.fn.cycle.API = { } } if ( timeout ) { - opts._lastQueue = $.now(); + opts._lastQueue = Date.now(); if ( specificTimeout === undefined ) opts._remainingTimeout = slideOpts.timeout; @@ -459,7 +459,7 @@ $.fn.cycle.API = { buildSlideOpts: function( slide ) { var opts = this.opts(); var val, shortName; - var slideOpts = slide.data() || {}; + var slideOpts = $.extend({}, slide.data() || {} ); for (var p in slideOpts) { // allow props to be accessed sans 'cycle' prefix and log the overrides if (slideOpts.hasOwnProperty(p) && /^cycle[A-Z]+/.test(p) ) { @@ -646,7 +646,16 @@ $.fn.cycle.transitions = { opts.animIn = { left: 0 }; opts.animOut = { left: fwd ? -w : w }; } - } + }, + scrollVert: { + before: function( opts, curr, next, fwd ) { + opts.API.stackSlides( opts, curr, next, fwd ); + var height = opts.container.css('overflow','hidden').height(); + opts.cssBefore = { top: fwd ? -height : height, left: 0, opacity: 1, display: 'block', visibility: 'visible' }; + opts.animIn = { top: 0 }; + opts.animOut = { top: fwd ? height : -height }; + } + }, }; // @see: http://jquery.malsup.com/cycle2/api diff --git a/src/jquery.cycle2.hash.js b/src/jquery.cycle2.hash.js index b9c6a6a1..2770dba8 100644 --- a/src/jquery.cycle2.hash.js +++ b/src/jquery.cycle2.hash.js @@ -1,4 +1,4 @@ -/*! hash plugin for Cycle2; version: 20130905 */ +/*! hash plugin for Cycle2; version: 20260120 */ (function($) { "use strict"; diff --git a/src/jquery.cycle2.loader.js b/src/jquery.cycle2.loader.js index 9fbda9b8..1baa6ad7 100644 --- a/src/jquery.cycle2.loader.js +++ b/src/jquery.cycle2.loader.js @@ -1,4 +1,4 @@ -/*! loader plugin for Cycle2; version: 20131121 */ +/*! loader plugin for Cycle2; version: 20260120 */ (function($) { "use strict"; @@ -18,9 +18,9 @@ $(document).on( 'cycle-bootstrap', function( e, opts ) { function add( slides, prepend ) { var slideArr = []; - if ( $.type( slides ) == 'string' ) + if ( typeof slides === 'string' ) slides = $.trim( slides ); - else if ( $.type( slides) === 'array' ) { + else if ( typeof slides === 'array' ) { for (var i=0; i < slides.length; i++ ) slides[i] = $(slides[i])[0]; } @@ -40,7 +40,7 @@ $(document).on( 'cycle-bootstrap', function( e, opts ) { images = images.filter(':not(.cycle-loader-ignore)').filter(':not([src=""])'); if ( ! images.length ) { --slideCount; - slideArr.push( slide ); + [].push.call( slideArr, slide ); return; } @@ -51,7 +51,7 @@ $(document).on( 'cycle-bootstrap', function( e, opts ) { imageLoaded(); } else { - $(this).load(function() { + $(this).on("load", function() { imageLoaded(); }).on("error", function() { if ( --count === 0 ) { @@ -80,10 +80,10 @@ $(document).on( 'cycle-bootstrap', function( e, opts ) { function addSlide( slide ) { var curr; if ( opts.loader == 'wait' ) { - slideArr.push( slide ); + [].push.call( slideArr, slide ); if ( slideCount === 0 ) { // #59; sort slides into original markup order - slideArr.sort( sorter ); + [].sort.call(slideArr, sorter ); addFn.apply( opts.API, [ slideArr, prepend ] ); opts.container.removeClass('cycle-loading'); } diff --git a/src/jquery.cycle2.pager.js b/src/jquery.cycle2.pager.js index 1732e76a..12d92bff 100644 --- a/src/jquery.cycle2.pager.js +++ b/src/jquery.cycle2.pager.js @@ -1,4 +1,4 @@ -/*! pager plugin for Cycle2; version: 20140415 */ +/*! pager plugin for Cycle2; version: 20260120 */ (function($) { "use strict"; diff --git a/src/jquery.cycle2.prevnext.js b/src/jquery.cycle2.prevnext.js index 9fc3b21c..1724c27e 100644 --- a/src/jquery.cycle2.prevnext.js +++ b/src/jquery.cycle2.prevnext.js @@ -1,4 +1,4 @@ -/*! prevnext plugin for Cycle2; version: 20140408 */ +/*! prevnext plugin for Cycle2; version: 20260120 */ (function($) { "use strict"; diff --git a/src/jquery.cycle2.progressive.js b/src/jquery.cycle2.progressive.js index 2eab77e2..c0320195 100644 --- a/src/jquery.cycle2.progressive.js +++ b/src/jquery.cycle2.progressive.js @@ -1,4 +1,4 @@ -/*! progressive loader plugin for Cycle2; version: 20130315 */ +/*! progressive loader plugin for Cycle2; version: 20260120 */ (function($) { "use strict"; @@ -14,13 +14,13 @@ $(document).on( 'cycle-pre-initialize', function( e, opts ) { var nextFn = API.next; var prevFn = API.prev; var prepareTxFn = API.prepareTx; - var type = $.type( opts.progressive ); + var type = typeof opts.progressive; var slides, scriptEl; if ( type == 'array' ) { slides = opts.progressive; } - else if ($.isFunction( opts.progressive ) ) { + else if (typeof opts.progressive==='function' ) { slides = opts.progressive( opts ); } else if ( type == 'string' ) { @@ -31,7 +31,7 @@ $(document).on( 'cycle-pre-initialize', function( e, opts ) { // is it json array? if ( /^(\[)/.test( slides ) ) { try { - slides = $.parseJSON( slides ); + if (slides!='') slides = JSON.parse( slides ); } catch(err) { API.log( 'error parsing progressive slides', err ); diff --git a/src/jquery.cycle2.tmpl.js b/src/jquery.cycle2.tmpl.js index 43113dfb..a1dce5e6 100644 --- a/src/jquery.cycle2.tmpl.js +++ b/src/jquery.cycle2.tmpl.js @@ -1,4 +1,4 @@ -/*! tmpl plugin for Cycle2; version: 20121227 */ +/*! tmpl plugin for Cycle2; version: 20260120 */ (function($) { "use strict"; @@ -27,7 +27,7 @@ $.extend($.fn.cycle.API, { prop = obj[str]; } - if ($.isFunction(prop)) + if (typeof prop==='function') return prop.apply(obj, args); if (prop !== undefined && prop !== null && prop != str) return prop;