Skip to content

Commit

Permalink
FlexSlider 2.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@bdukes
bdukes committed Mar 3, 2015
1 parent 8d785e8 commit 920b9bf
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 46 deletions.
4 changes: 4 additions & 0 deletions FlexSlider_2.3.0/CHANGES.htm → FlexSlider_2.4.0/CHANGES.htm
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<ol>
<li>
<h6>Version 2.4.0</h6>
<p>Update for improved standards. Adds classes to li nav elements. Reset for li elements in stylesheet.</p>
</li>
<li>
<h6>Version 2.3.0</h6>
<p>Fix for pauseInvisible attribute for Chrome and the Page Visibility API.</p>
Expand Down
6 changes: 3 additions & 3 deletions FlexSlider_2.3.0/FlexSlider.dnn → FlexSlider_2.4.0/FlexSlider.dnn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="FlexSlider" type="JavaScript_Library" version="02.03.00">
<package name="FlexSlider" type="JavaScript_Library" version="02.04.00">
<friendlyName>FlexSlider JavaScript Library</friendlyName>
<description>An awesome, fully responsive jQuery slider toolkit.</description>
<owner>
Expand All @@ -21,7 +21,7 @@
<libraryName>FlexSlider</libraryName>
<fileName>jquery.flexslider.js</fileName>
<preferredScriptLocation>BodyBottom</preferredScriptLocation>
<CDNPath>https://cdnjs.cloudflare.com/ajax/libs/flexslider/2.3.0/jquery.flexslider-min.js</CDNPath>
<CDNPath>https://cdn.jsdelivr.net/flexslider/2.4/jquery.flexslider-min.js</CDNPath>
<objectName>jQuery.fn.flexslider</objectName>
</javaScriptLibrary>
</component>
Expand All @@ -35,7 +35,7 @@
</component>
<component type="ResourceFile">
<resourceFiles>
<basePath>Resources\Libraries\FlexSlider\02_03_00</basePath>
<basePath>Resources\Libraries\FlexSlider\02_04_00</basePath>
<resourceFile>
<name>Resources.zip</name>
</resourceFile>
Expand Down
2 changes: 1 addition & 1 deletion FlexSlider_2.3.0/LICENSE.htm → FlexSlider_2.4.0/LICENSE.htm
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p>FlexSlider is <a href="https://github.com/woothemes/FlexSlider/tree/version/2.3.0#general-notes">licensed under the GPLv2 license</a></p>
<p>FlexSlider is <a href="https://github.com/woothemes/FlexSlider/tree/version/2.4.0#general-notes">licensed under the GPLv2 license</a></p>
Binary file renamed FlexSlider_2.3.0/Resources.zip → FlexSlider_2.4.0/Resources.zip
View file
Binary file not shown.
85 changes: 43 additions & 42 deletions FlexSlider_2.3.0/jquery.flexslider.js → FlexSlider_2.4.0/jquery.flexslider.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery FlexSlider v2.3.0
* jQuery FlexSlider v2.4.0
* Copyright 2012 WooThemes
* Contributing Author: Tyler Smith
*/
Expand Down Expand Up @@ -38,7 +38,7 @@
slider.animating = false;
// Get current slide and make sure it is a number
slider.currentSlide = parseInt( ( slider.vars.startAt ? slider.vars.startAt : 0), 10 );
if ( isNaN( slider.currentSlide ) ) slider.currentSlide = 0;
if ( isNaN( slider.currentSlide ) ) { slider.currentSlide = 0; }
slider.animatingTo = slider.currentSlide;
slider.atEnd = (slider.currentSlide === 0 || slider.currentSlide === slider.last);
slider.containerSelector = slider.vars.selector.substr(0,slider.vars.selector.search(' '));
Expand All @@ -48,7 +48,7 @@
// SYNC:
slider.syncExists = $(slider.vars.sync).length > 0;
// SLIDE:
if (slider.vars.animation === "slide") slider.vars.animation = "swing";
if (slider.vars.animation === "slide") { slider.vars.animation = "swing"; }
slider.prop = (vertical) ? "top" : "marginLeft";
slider.args = {};
// SLIDESHOW:
Expand Down Expand Up @@ -88,10 +88,10 @@
slider.setup("init");

// CONTROLNAV:
if (slider.vars.controlNav) methods.controlNav.setup();
if (slider.vars.controlNav) { methods.controlNav.setup(); }

// DIRECTIONNAV:
if (slider.vars.directionNav) methods.directionNav.setup();
if (slider.vars.directionNav) { methods.directionNav.setup(); }

// KEYBOARD:
if (slider.vars.keyboard && ($(slider.containerSelector).length === 1 || slider.vars.multipleKeyboard)) {
Expand All @@ -114,18 +114,18 @@
}

// PAUSEPLAY
if (slider.vars.pausePlay) methods.pausePlay.setup();
if (slider.vars.pausePlay) { methods.pausePlay.setup(); }

//PAUSE WHEN INVISIBLE
if (slider.vars.slideshow && slider.vars.pauseInvisible) methods.pauseInvisible.init();
if (slider.vars.slideshow && slider.vars.pauseInvisible) { methods.pauseInvisible.init(); }

// SLIDSESHOW
if (slider.vars.slideshow) {
if (slider.vars.pauseOnHover) {
slider.hover(function() {
if (!slider.manualPlay && !slider.manualPause) slider.pause();
if (!slider.manualPlay && !slider.manualPause) { slider.pause(); }
}, function() {
if (!slider.manualPause && !slider.manualPlay && !slider.stopped) slider.play();
if (!slider.manualPause && !slider.manualPlay && !slider.stopped) { slider.play(); }
});
}
// initialize animation
Expand All @@ -136,13 +136,13 @@
}

// ASNAV:
if (asNav) methods.asNav.setup();
if (asNav) { methods.asNav.setup(); }

// TOUCH
if (touch && slider.vars.touch) methods.touch();
if (touch && slider.vars.touch) { methods.touch(); }

// FADE&&SMOOTHHEIGHT || SLIDE:
if (!fade || (fade && slider.vars.smoothHeight)) $(window).bind("resize orientationchange focus", methods.resize);
if (!fade || (fade && slider.vars.smoothHeight)) { $(window).bind("resize orientationchange focus", methods.resize); }

slider.find("img").attr("draggable", "false");

Expand Down Expand Up @@ -178,8 +178,9 @@
that._gesture.target = that;
that.addEventListener("MSPointerDown", function (e){
e.preventDefault();
if(e.currentTarget._gesture)
e.currentTarget._gesture.addPointer(e.pointerId);
if(e.currentTarget._gesture) {
e.currentTarget._gesture.addPointer(e.pointerId);
}
}, false);
that.addEventListener("MSGestureTap", function (e){
e.preventDefault();
Expand Down Expand Up @@ -216,7 +217,7 @@
item = (slider.vars.controlNav === "thumbnails") ? '<img src="' + slide.attr( 'data-thumb' ) + '"/>' : '<a>' + j + '</a>';
if ( 'thumbnails' === slider.vars.controlNav && true === slider.vars.thumbCaptions ) {
var captn = slide.attr( 'data-thumbcaption' );
if ( '' != captn && undefined != captn ) item += '<span class="' + namespace + 'caption">' + captn + '</span>';
if ( '' != captn && undefined != captn ) { item += '<span class="' + namespace + 'caption">' + captn + '</span>'; }
}
slider.controlNavScaffold.append('<li>' + item + '</li>');
j++;
Expand Down Expand Up @@ -295,7 +296,7 @@
},
directionNav: {
setup: function() {
var directionNavScaffold = $('<ul class="' + namespace + 'direction-nav"><li><a class="' + namespace + 'prev" href="#">' + slider.vars.prevText + '</a></li><li><a class="' + namespace + 'next" href="#">' + slider.vars.nextText + '</a></li></ul>');
var directionNavScaffold = $('<ul class="' + namespace + 'direction-nav"><li class="' + namespace + 'nav-prev"><a class="' + namespace + 'prev" href="#">' + slider.vars.prevText + '</a></li><li class="' + namespace + 'nav-next"><a class="' + namespace + 'next" href="#">' + slider.vars.nextText + '</a></li></ul>');

// CONTROLSCONTAINER:
if (slider.controlsContainer) {
Expand Down Expand Up @@ -457,7 +458,7 @@
if (slider.canAdvance(target) && (Number(new Date()) - startT < 550 && Math.abs(updateDx) > 50 || Math.abs(updateDx) > cwidth/2)) {
slider.flexAnimate(target, slider.vars.pauseOnAction);
} else {
if (!fade) slider.flexAnimate(slider.currentSlide, slider.vars.pauseOnAction, true);
if (!fade) { slider.flexAnimate(slider.currentSlide, slider.vars.pauseOnAction, true); }
}
}
el.removeEventListener('touchend', onTouchEnd, false);
Expand Down Expand Up @@ -542,7 +543,7 @@
if (slider.canAdvance(target) && (Number(new Date()) - startT < 550 && Math.abs(updateDx) > 50 || Math.abs(updateDx) > cwidth/2)) {
slider.flexAnimate(target, slider.vars.pauseOnAction);
} else {
if (!fade) slider.flexAnimate(slider.currentSlide, slider.vars.pauseOnAction, true);
if (!fade) { slider.flexAnimate(slider.currentSlide, slider.vars.pauseOnAction, true); }
}
}

Expand All @@ -556,7 +557,7 @@
},
resize: function() {
if (!slider.animating && slider.is(':visible')) {
if (!carousel) slider.doMath();
if (!carousel) { slider.doMath(); }

if (fade) {
// SMOOTH HEIGHT:
Expand All @@ -571,7 +572,7 @@
slider.setProps(slider.h, "setTotal");
} else {
// SMOOTH HEIGHT:
if (slider.vars.smoothHeight) methods.smoothHeight();
if (slider.vars.smoothHeight) { methods.smoothHeight(); }
slider.newSlides.width(slider.computedW);
slider.setProps(slider.computedW, "setTotal");
}
Expand Down Expand Up @@ -691,33 +692,33 @@
slider.animatingTo = target;

// SLIDESHOW:
if (pause) slider.pause();
if (pause) { slider.pause(); }

// API: before() animation Callback
slider.vars.before(slider);

// SYNC:
if (slider.syncExists && !fromNav) methods.sync("animate");
if (slider.syncExists && !fromNav) { methods.sync("animate"); }

// CONTROLNAV
if (slider.vars.controlNav) methods.controlNav.active();
if (slider.vars.controlNav) { methods.controlNav.active(); }

// !CAROUSEL:
// CANDIDATE: slide active class (for add/remove slide)
if (!carousel) slider.slides.removeClass(namespace + 'active-slide').eq(target).addClass(namespace + 'active-slide');
if (!carousel) { slider.slides.removeClass(namespace + 'active-slide').eq(target).addClass(namespace + 'active-slide'); }

// INFINITE LOOP:
// CANDIDATE: atEnd
slider.atEnd = target === 0 || target === slider.last;

// DIRECTIONNAV:
if (slider.vars.directionNav) methods.directionNav.update();
if (slider.vars.directionNav) { methods.directionNav.update(); }

if (target === slider.last) {
// API: end() of cycle Callback
slider.vars.end(slider);
// SLIDESHOW && !INFINITE LOOP:
if (!slider.vars.animationLoop) slider.pause();
if (!slider.vars.animationLoop) { slider.pause(); }
}

// SLIDE:
Expand Down Expand Up @@ -778,7 +779,7 @@
}
}
// SMOOTH HEIGHT:
if (slider.vars.smoothHeight) methods.smoothHeight(slider.vars.animationSpeed);
if (slider.vars.smoothHeight) { methods.smoothHeight(slider.vars.animationSpeed); }
}
};
slider.wrapup = function(dimension) {
Expand All @@ -798,27 +799,27 @@

// SLIDESHOW:
slider.animateSlides = function() {
if (!slider.animating && focused ) slider.flexAnimate(slider.getTarget("next"));
if (!slider.animating && focused ) { slider.flexAnimate(slider.getTarget("next")); }
};
// SLIDESHOW:
slider.pause = function() {
clearInterval(slider.animatedSlides);
slider.animatedSlides = null;
slider.playing = false;
// PAUSEPLAY:
if (slider.vars.pausePlay) methods.pausePlay.update("play");
if (slider.vars.pausePlay) { methods.pausePlay.update("play"); }
// SYNC:
if (slider.syncExists) methods.sync("pause");
if (slider.syncExists) { methods.sync("pause"); }
};
// SLIDESHOW:
slider.play = function() {
if (slider.playing) clearInterval(slider.animatedSlides);
if (slider.playing) { clearInterval(slider.animatedSlides); }
slider.animatedSlides = slider.animatedSlides || setInterval(slider.animateSlides, slider.vars.slideshowSpeed);
slider.started = slider.playing = true;
// PAUSEPLAY:
if (slider.vars.pausePlay) methods.pausePlay.update("pause");
if (slider.vars.pausePlay) { methods.pausePlay.update("pause"); }
// SYNC:
if (slider.syncExists) methods.sync("play");
if (slider.syncExists) { methods.sync("play"); }
};
// STOP:
slider.stop = function () {
Expand Down Expand Up @@ -878,7 +879,7 @@
}

slider.args[slider.prop] = target;
if (slider.transitions || dur === undefined) slider.container.css(slider.args);
if (slider.transitions || dur === undefined) { slider.container.css(slider.args); }

slider.container.css('transform',target);
};
Expand All @@ -905,7 +906,7 @@
slider.cloneCount = 2;
slider.cloneOffset = 1;
// clear out old clones
if (type !== "init") slider.container.find('.clone').remove();
if (type !== "init") { slider.container.find('.clone').remove(); }
slider.container.append(methods.uniqueID(slider.slides.first().clone().addClass('clone')).attr('aria-hidden', 'true'))
.prepend(methods.uniqueID(slider.slides.last().clone().addClass('clone')).attr('aria-hidden', 'true'));
}
Expand All @@ -928,7 +929,7 @@
slider.doMath();
slider.newSlides.css({"width": slider.computedW, "float": "left", "display": "block"});
// SMOOTH HEIGHT:
if (slider.vars.smoothHeight) methods.smoothHeight();
if (slider.vars.smoothHeight) { methods.smoothHeight(); }
}, (type === "init") ? 100 : 0);
}
} else { // FADE:
Expand All @@ -946,11 +947,11 @@
}
}
// SMOOTH HEIGHT:
if (slider.vars.smoothHeight) methods.smoothHeight();
if (slider.vars.smoothHeight) { methods.smoothHeight(); }
}
// !CAROUSEL:
// CANDIDATE: active slide
if (!carousel) slider.slides.removeClass(namespace + "active-slide").eq(slider.currentSlide).addClass(namespace + "active-slide");
if (!carousel) { slider.slides.removeClass(namespace + "active-slide").eq(slider.currentSlide).addClass(namespace + "active-slide"); }

//FlexSlider: init() Callback
slider.vars.init(slider);
Expand Down Expand Up @@ -1015,7 +1016,7 @@
}
}
// update directionNav
if (slider.vars.directionNav) methods.directionNav.update();
if (slider.vars.directionNav) { methods.directionNav.update(); }

};

Expand Down Expand Up @@ -1148,7 +1149,7 @@

//FlexSlider: Plugin Function
$.fn.flexslider = function(options) {
if (options === undefined) options = {};
if (options === undefined) { options = {}; }

if (typeof options === "object") {
return this.each(function() {
Expand All @@ -1158,7 +1159,7 @@

if ( ( $slides.length === 1 && options.allowOneSlide === true ) || $slides.length === 0 ) {
$slides.fadeIn(400);
if (options.start) options.start($this);
if (options.start) { options.start($this); }
} else if ($this.data('flexslider') === undefined) {
new $.flexslider(this, options);
}
Expand All @@ -1173,7 +1174,7 @@
case "next": $slider.flexAnimate($slider.getTarget("next"), true); break;
case "prev":
case "previous": $slider.flexAnimate($slider.getTarget("prev"), true); break;
default: if (typeof options === "number") $slider.flexAnimate(options, true);
default: if (typeof options === "number") { $slider.flexAnimate(options, true); }
}
}
};
Expand Down
Binary file removed _InstallPackages/FlexSlider_2.3.0.zip
View file
Binary file not shown.
Binary file added _InstallPackages/FlexSlider_2.4.0.zip
View file
Binary file not shown.

0 comments on commit 920b9bf

Please sign in to comment.