Skip to content

Commit 920b9bf

Browse files
bdukesbdukes
committed
FlexSlider 2.4.0
1 parent 8d785e8 commit 920b9bf

File tree

7 files changed

+51
-46
lines changed

7 files changed

+51
-46
lines changed

‎FlexSlider_2.3.0/CHANGES.htm renamed to ‎FlexSlider_2.4.0/CHANGES.htm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<ol>
2+
<li>
3+
<h6>Version 2.4.0</h6>
4+
<p>Update for improved standards. Adds classes to li nav elements. Reset for li elements in stylesheet.</p>
5+
</li>
26
<li>
37
<h6>Version 2.3.0</h6>
48
<p>Fix for pauseInvisible attribute for Chrome and the Page Visibility API.</p>

‎FlexSlider_2.3.0/FlexSlider.dnn renamed to ‎FlexSlider_2.4.0/FlexSlider.dnn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="FlexSlider" type="JavaScript_Library" version="02.03.00">
3+
<package name="FlexSlider" type="JavaScript_Library" version="02.04.00">
44
<friendlyName>FlexSlider JavaScript Library</friendlyName>
55
<description>An awesome, fully responsive jQuery slider toolkit.</description>
66
<owner>
@@ -21,7 +21,7 @@
2121
<libraryName>FlexSlider</libraryName>
2222
<fileName>jquery.flexslider.js</fileName>
2323
<preferredScriptLocation>BodyBottom</preferredScriptLocation>
24-
<CDNPath>https://cdnjs.cloudflare.com/ajax/libs/flexslider/2.3.0/jquery.flexslider-min.js</CDNPath>
24+
<CDNPath>https://cdn.jsdelivr.net/flexslider/2.4/jquery.flexslider-min.js</CDNPath>
2525
<objectName>jQuery.fn.flexslider</objectName>
2626
</javaScriptLibrary>
2727
</component>
@@ -35,7 +35,7 @@
3535
</component>
3636
<component type="ResourceFile">
3737
<resourceFiles>
38-
<basePath>Resources\Libraries\FlexSlider\02_03_00</basePath>
38+
<basePath>Resources\Libraries\FlexSlider\02_04_00</basePath>
3939
<resourceFile>
4040
<name>Resources.zip</name>
4141
</resourceFile>

‎FlexSlider_2.3.0/LICENSE.htm renamed to ‎FlexSlider_2.4.0/LICENSE.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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>
1+
<p>FlexSlider is <a href="https://github.com/woothemes/FlexSlider/tree/version/2.4.0#general-notes">licensed under the GPLv2 license</a></p>

‎FlexSlider_2.3.0/Resources.zip renamed to ‎FlexSlider_2.4.0/Resources.zip

7.66 KB
Binary file not shown.

‎FlexSlider_2.3.0/jquery.flexslider.js renamed to ‎FlexSlider_2.4.0/jquery.flexslider.js

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery FlexSlider v2.3.0
2+
* jQuery FlexSlider v2.4.0
33
* Copyright 2012 WooThemes
44
* Contributing Author: Tyler Smith
55
*/
@@ -38,7 +38,7 @@
3838
slider.animating = false;
3939
// Get current slide and make sure it is a number
4040
slider.currentSlide = parseInt( ( slider.vars.startAt ? slider.vars.startAt : 0), 10 );
41-
if ( isNaN( slider.currentSlide ) ) slider.currentSlide = 0;
41+
if ( isNaN( slider.currentSlide ) ) { slider.currentSlide = 0; }
4242
slider.animatingTo = slider.currentSlide;
4343
slider.atEnd = (slider.currentSlide === 0 || slider.currentSlide === slider.last);
4444
slider.containerSelector = slider.vars.selector.substr(0,slider.vars.selector.search(' '));
@@ -48,7 +48,7 @@
4848
// SYNC:
4949
slider.syncExists = $(slider.vars.sync).length > 0;
5050
// SLIDE:
51-
if (slider.vars.animation === "slide") slider.vars.animation = "swing";
51+
if (slider.vars.animation === "slide") { slider.vars.animation = "swing"; }
5252
slider.prop = (vertical) ? "top" : "marginLeft";
5353
slider.args = {};
5454
// SLIDESHOW:
@@ -88,10 +88,10 @@
8888
slider.setup("init");
8989

9090
// CONTROLNAV:
91-
if (slider.vars.controlNav) methods.controlNav.setup();
91+
if (slider.vars.controlNav) { methods.controlNav.setup(); }
9292

9393
// DIRECTIONNAV:
94-
if (slider.vars.directionNav) methods.directionNav.setup();
94+
if (slider.vars.directionNav) { methods.directionNav.setup(); }
9595

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

116116
// PAUSEPLAY
117-
if (slider.vars.pausePlay) methods.pausePlay.setup();
117+
if (slider.vars.pausePlay) { methods.pausePlay.setup(); }
118118

119119
//PAUSE WHEN INVISIBLE
120-
if (slider.vars.slideshow && slider.vars.pauseInvisible) methods.pauseInvisible.init();
120+
if (slider.vars.slideshow && slider.vars.pauseInvisible) { methods.pauseInvisible.init(); }
121121

122122
// SLIDSESHOW
123123
if (slider.vars.slideshow) {
124124
if (slider.vars.pauseOnHover) {
125125
slider.hover(function() {
126-
if (!slider.manualPlay && !slider.manualPause) slider.pause();
126+
if (!slider.manualPlay && !slider.manualPause) { slider.pause(); }
127127
}, function() {
128-
if (!slider.manualPause && !slider.manualPlay && !slider.stopped) slider.play();
128+
if (!slider.manualPause && !slider.manualPlay && !slider.stopped) { slider.play(); }
129129
});
130130
}
131131
// initialize animation
@@ -136,13 +136,13 @@
136136
}
137137

138138
// ASNAV:
139-
if (asNav) methods.asNav.setup();
139+
if (asNav) { methods.asNav.setup(); }
140140

141141
// TOUCH
142-
if (touch && slider.vars.touch) methods.touch();
142+
if (touch && slider.vars.touch) { methods.touch(); }
143143

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

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

@@ -178,8 +178,9 @@
178178
that._gesture.target = that;
179179
that.addEventListener("MSPointerDown", function (e){
180180
e.preventDefault();
181-
if(e.currentTarget._gesture)
182-
e.currentTarget._gesture.addPointer(e.pointerId);
181+
if(e.currentTarget._gesture) {
182+
e.currentTarget._gesture.addPointer(e.pointerId);
183+
}
183184
}, false);
184185
that.addEventListener("MSGestureTap", function (e){
185186
e.preventDefault();
@@ -216,7 +217,7 @@
216217
item = (slider.vars.controlNav === "thumbnails") ? '<img src="' + slide.attr( 'data-thumb' ) + '"/>' : '<a>' + j + '</a>';
217218
if ( 'thumbnails' === slider.vars.controlNav && true === slider.vars.thumbCaptions ) {
218219
var captn = slide.attr( 'data-thumbcaption' );
219-
if ( '' != captn && undefined != captn ) item += '<span class="' + namespace + 'caption">' + captn + '</span>';
220+
if ( '' != captn && undefined != captn ) { item += '<span class="' + namespace + 'caption">' + captn + '</span>'; }
220221
}
221222
slider.controlNavScaffold.append('<li>' + item + '</li>');
222223
j++;
@@ -295,7 +296,7 @@
295296
},
296297
directionNav: {
297298
setup: function() {
298-
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>');
299+
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>');
299300

300301
// CONTROLSCONTAINER:
301302
if (slider.controlsContainer) {
@@ -457,7 +458,7 @@
457458
if (slider.canAdvance(target) && (Number(new Date()) - startT < 550 && Math.abs(updateDx) > 50 || Math.abs(updateDx) > cwidth/2)) {
458459
slider.flexAnimate(target, slider.vars.pauseOnAction);
459460
} else {
460-
if (!fade) slider.flexAnimate(slider.currentSlide, slider.vars.pauseOnAction, true);
461+
if (!fade) { slider.flexAnimate(slider.currentSlide, slider.vars.pauseOnAction, true); }
461462
}
462463
}
463464
el.removeEventListener('touchend', onTouchEnd, false);
@@ -542,7 +543,7 @@
542543
if (slider.canAdvance(target) && (Number(new Date()) - startT < 550 && Math.abs(updateDx) > 50 || Math.abs(updateDx) > cwidth/2)) {
543544
slider.flexAnimate(target, slider.vars.pauseOnAction);
544545
} else {
545-
if (!fade) slider.flexAnimate(slider.currentSlide, slider.vars.pauseOnAction, true);
546+
if (!fade) { slider.flexAnimate(slider.currentSlide, slider.vars.pauseOnAction, true); }
546547
}
547548
}
548549

@@ -556,7 +557,7 @@
556557
},
557558
resize: function() {
558559
if (!slider.animating && slider.is(':visible')) {
559-
if (!carousel) slider.doMath();
560+
if (!carousel) { slider.doMath(); }
560561

561562
if (fade) {
562563
// SMOOTH HEIGHT:
@@ -571,7 +572,7 @@
571572
slider.setProps(slider.h, "setTotal");
572573
} else {
573574
// SMOOTH HEIGHT:
574-
if (slider.vars.smoothHeight) methods.smoothHeight();
575+
if (slider.vars.smoothHeight) { methods.smoothHeight(); }
575576
slider.newSlides.width(slider.computedW);
576577
slider.setProps(slider.computedW, "setTotal");
577578
}
@@ -691,33 +692,33 @@
691692
slider.animatingTo = target;
692693

693694
// SLIDESHOW:
694-
if (pause) slider.pause();
695+
if (pause) { slider.pause(); }
695696

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

699700
// SYNC:
700-
if (slider.syncExists && !fromNav) methods.sync("animate");
701+
if (slider.syncExists && !fromNav) { methods.sync("animate"); }
701702

702703
// CONTROLNAV
703-
if (slider.vars.controlNav) methods.controlNav.active();
704+
if (slider.vars.controlNav) { methods.controlNav.active(); }
704705

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

709710
// INFINITE LOOP:
710711
// CANDIDATE: atEnd
711712
slider.atEnd = target === 0 || target === slider.last;
712713

713714
// DIRECTIONNAV:
714-
if (slider.vars.directionNav) methods.directionNav.update();
715+
if (slider.vars.directionNav) { methods.directionNav.update(); }
715716

716717
if (target === slider.last) {
717718
// API: end() of cycle Callback
718719
slider.vars.end(slider);
719720
// SLIDESHOW && !INFINITE LOOP:
720-
if (!slider.vars.animationLoop) slider.pause();
721+
if (!slider.vars.animationLoop) { slider.pause(); }
721722
}
722723

723724
// SLIDE:
@@ -778,7 +779,7 @@
778779
}
779780
}
780781
// SMOOTH HEIGHT:
781-
if (slider.vars.smoothHeight) methods.smoothHeight(slider.vars.animationSpeed);
782+
if (slider.vars.smoothHeight) { methods.smoothHeight(slider.vars.animationSpeed); }
782783
}
783784
};
784785
slider.wrapup = function(dimension) {
@@ -798,27 +799,27 @@
798799

799800
// SLIDESHOW:
800801
slider.animateSlides = function() {
801-
if (!slider.animating && focused ) slider.flexAnimate(slider.getTarget("next"));
802+
if (!slider.animating && focused ) { slider.flexAnimate(slider.getTarget("next")); }
802803
};
803804
// SLIDESHOW:
804805
slider.pause = function() {
805806
clearInterval(slider.animatedSlides);
806807
slider.animatedSlides = null;
807808
slider.playing = false;
808809
// PAUSEPLAY:
809-
if (slider.vars.pausePlay) methods.pausePlay.update("play");
810+
if (slider.vars.pausePlay) { methods.pausePlay.update("play"); }
810811
// SYNC:
811-
if (slider.syncExists) methods.sync("pause");
812+
if (slider.syncExists) { methods.sync("pause"); }
812813
};
813814
// SLIDESHOW:
814815
slider.play = function() {
815-
if (slider.playing) clearInterval(slider.animatedSlides);
816+
if (slider.playing) { clearInterval(slider.animatedSlides); }
816817
slider.animatedSlides = slider.animatedSlides || setInterval(slider.animateSlides, slider.vars.slideshowSpeed);
817818
slider.started = slider.playing = true;
818819
// PAUSEPLAY:
819-
if (slider.vars.pausePlay) methods.pausePlay.update("pause");
820+
if (slider.vars.pausePlay) { methods.pausePlay.update("pause"); }
820821
// SYNC:
821-
if (slider.syncExists) methods.sync("play");
822+
if (slider.syncExists) { methods.sync("play"); }
822823
};
823824
// STOP:
824825
slider.stop = function () {
@@ -878,7 +879,7 @@
878879
}
879880

880881
slider.args[slider.prop] = target;
881-
if (slider.transitions || dur === undefined) slider.container.css(slider.args);
882+
if (slider.transitions || dur === undefined) { slider.container.css(slider.args); }
882883

883884
slider.container.css('transform',target);
884885
};
@@ -905,7 +906,7 @@
905906
slider.cloneCount = 2;
906907
slider.cloneOffset = 1;
907908
// clear out old clones
908-
if (type !== "init") slider.container.find('.clone').remove();
909+
if (type !== "init") { slider.container.find('.clone').remove(); }
909910
slider.container.append(methods.uniqueID(slider.slides.first().clone().addClass('clone')).attr('aria-hidden', 'true'))
910911
.prepend(methods.uniqueID(slider.slides.last().clone().addClass('clone')).attr('aria-hidden', 'true'));
911912
}
@@ -928,7 +929,7 @@
928929
slider.doMath();
929930
slider.newSlides.css({"width": slider.computedW, "float": "left", "display": "block"});
930931
// SMOOTH HEIGHT:
931-
if (slider.vars.smoothHeight) methods.smoothHeight();
932+
if (slider.vars.smoothHeight) { methods.smoothHeight(); }
932933
}, (type === "init") ? 100 : 0);
933934
}
934935
} else { // FADE:
@@ -946,11 +947,11 @@
946947
}
947948
}
948949
// SMOOTH HEIGHT:
949-
if (slider.vars.smoothHeight) methods.smoothHeight();
950+
if (slider.vars.smoothHeight) { methods.smoothHeight(); }
950951
}
951952
// !CAROUSEL:
952953
// CANDIDATE: active slide
953-
if (!carousel) slider.slides.removeClass(namespace + "active-slide").eq(slider.currentSlide).addClass(namespace + "active-slide");
954+
if (!carousel) { slider.slides.removeClass(namespace + "active-slide").eq(slider.currentSlide).addClass(namespace + "active-slide"); }
954955

955956
//FlexSlider: init() Callback
956957
slider.vars.init(slider);
@@ -1015,7 +1016,7 @@
10151016
}
10161017
}
10171018
// update directionNav
1018-
if (slider.vars.directionNav) methods.directionNav.update();
1019+
if (slider.vars.directionNav) { methods.directionNav.update(); }
10191020

10201021
};
10211022

@@ -1148,7 +1149,7 @@
11481149

11491150
//FlexSlider: Plugin Function
11501151
$.fn.flexslider = function(options) {
1151-
if (options === undefined) options = {};
1152+
if (options === undefined) { options = {}; }
11521153

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

11591160
if ( ( $slides.length === 1 && options.allowOneSlide === true ) || $slides.length === 0 ) {
11601161
$slides.fadeIn(400);
1161-
if (options.start) options.start($this);
1162+
if (options.start) { options.start($this); }
11621163
} else if ($this.data('flexslider') === undefined) {
11631164
new $.flexslider(this, options);
11641165
}
@@ -1173,7 +1174,7 @@
11731174
case "next": $slider.flexAnimate($slider.getTarget("next"), true); break;
11741175
case "prev":
11751176
case "previous": $slider.flexAnimate($slider.getTarget("prev"), true); break;
1176-
default: if (typeof options === "number") $slider.flexAnimate(options, true);
1177+
default: if (typeof options === "number") { $slider.flexAnimate(options, true); }
11771178
}
11781179
}
11791180
};

‎_InstallPackages/FlexSlider_2.3.0.zip

-20 KB
Binary file not shown.

‎_InstallPackages/FlexSlider_2.4.0.zip

20.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)