Skip to content

Commit

Permalink
Fix: update flexslider to the latest version presscustomizr#427
Browse files Browse the repository at this point in the history
  • Loading branch information
nikeo committed Apr 6, 2017
1 parent 5a87171 commit c73b6f8
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 17 deletions.
61 changes: 44 additions & 17 deletions assets/front/js/lib/jquery.flexslider.js
View file
@@ -1,5 +1,5 @@
/*
* jQuery FlexSlider v2.6.0
* jQuery FlexSlider v2.6.1
* Copyright 2012 WooThemes
* Contributing Author: Tyler Smith
*/
Expand All @@ -13,6 +13,11 @@
var slider = $(el);

// making variables public

//if rtl value was not passed and html is in rtl..enable it by default.
if(typeof options.rtl=='undefined' && $('html').attr('dir')=='rtl'){
options.rtl=true;
}
slider.vars = $.extend({}, $.flexslider.defaults, options);

var namespace = slider.vars.namespace,
Expand Down Expand Up @@ -49,7 +54,7 @@
slider.syncExists = $(slider.vars.sync).length > 0;
// SLIDE:
if (slider.vars.animation === "slide") { slider.vars.animation = "swing"; }
slider.prop = (vertical) ? "top" : "marginLeft";
slider.prop = (vertical) ? "top" : ( slider.vars.rtl ? "marginRight" : "marginLeft" );
slider.args = {};
// SLIDESHOW:
slider.manualPause = false;
Expand Down Expand Up @@ -101,8 +106,14 @@
$(document).bind('keyup', function(event) {
var keycode = event.keyCode;
if (!slider.animating && (keycode === 39 || keycode === 37)) {
var target = (keycode === 39) ? slider.getTarget('next') :
(keycode === 37) ? slider.getTarget('prev') : false;
var target = (slider.vars.rtl?
((keycode === 37) ? slider.getTarget('next') :
(keycode === 39) ? slider.getTarget('prev') : false)
:
((keycode === 39) ? slider.getTarget('next') :
(keycode === 37) ? slider.getTarget('prev') : false)
)
;
slider.flexAnimate(target, slider.vars.pauseOnAction);
}
});
Expand Down Expand Up @@ -165,8 +176,15 @@
e.preventDefault();
var $slide = $(this),
target = $slide.index();
var posFromLeft = $slide.offset().left - $(slider).scrollLeft(); // Find position of slide relative to left of slider container
if( posFromLeft <= 0 && $slide.hasClass( namespace + 'active-slide' ) ) {
var posFromX;
if(slider.vars.rtl){
posFromX = -1*($slide.offset().right - $(slider).scrollLeft()); // Find position of slide relative to right of slider container
}
else
{
posFromX = $slide.offset().left - $(slider).scrollLeft(); // Find position of slide relative to left of slider container
}
if( posFromX <= 0 && $slide.hasClass( namespace + 'active-slide' ) ) {
slider.flexAnimate(slider.getTarget("prev"), true);
} else if (!$(slider.vars.asNavFor).data('flexslider').animating && !$slide.hasClass(namespace + "active-slide")) {
slider.direction = (slider.currentItem < target) ? "next" : "prev";
Expand Down Expand Up @@ -218,7 +236,7 @@
for (var i = 0; i < slider.pagingCount; i++) {
slide = slider.slides.eq(i);
if ( undefined === slide.attr( 'data-thumb-alt' ) ) { slide.attr( 'data-thumb-alt', '' ); }
altText = ( '' !== slide.attr( 'data-thumb-alt' ) ) ? altText = ' alt="' + slide.attr( 'data-thumb-alt' ) + '"' : '';
var altText = ( '' !== slide.attr( 'data-thumb-alt' ) ) ? altText = ' alt="' + slide.attr( 'data-thumb-alt' ) + '"' : '';
item = (slider.vars.controlNav === "thumbnails") ? '<img src="' + slide.attr( 'data-thumb' ) + '"' + altText + '/>' : '<a href="#">' + j + '</a>';
if ( 'thumbnails' === slider.vars.controlNav && true === slider.vars.thumbCaptions ) {
var captn = slide.attr( 'data-thumbcaption' );
Expand Down Expand Up @@ -428,7 +446,6 @@
(reverse) ? (slider.last - slider.currentSlide + slider.cloneOffset) * cwidth : (slider.currentSlide + slider.cloneOffset) * cwidth;
startX = (vertical) ? localY : localX;
startY = (vertical) ? localX : localY;

el.addEventListener('touchmove', onTouchMove, false);
el.addEventListener('touchend', onTouchEnd, false);
}
Expand All @@ -440,9 +457,8 @@
localX = e.touches[0].pageX;
localY = e.touches[0].pageY;

dx = (vertical) ? startX - localY : startX - localX;
dx = (vertical) ? startX - localY : (slider.vars.rtl?-1:1)*(startX - localX);
scrolling = (vertical) ? (Math.abs(dx) < Math.abs(localX - startY)) : (Math.abs(dx) < Math.abs(localY - startY));

var fxms = 500;

if ( ! scrolling || Number( new Date() ) - startT > fxms ) {
Expand Down Expand Up @@ -519,7 +535,7 @@

//Accumulate translations.
accDx = accDx + ((vertical) ? transY : transX);
dx = accDx;
dx = (slider.vars.rtl?-1:1)*accDx;
scrolling = (vertical) ? (Math.abs(accDx) < Math.abs(-transX)) : (Math.abs(accDx) < Math.abs(-transY));

if(e.detail === e.MSGESTURE_FLAG_INERTIA){
Expand Down Expand Up @@ -592,7 +608,7 @@
smoothHeight: function(dur) {
if (!vertical || fade) {
var $obj = (fade) ? slider : slider.viewport;
(dur) ? $obj.animate({"height": slider.slides.eq(slider.animatingTo).height()}, dur) : $obj.height(slider.slides.eq(slider.animatingTo).height());
(dur) ? $obj.animate({"height": slider.slides.eq(slider.animatingTo).innerHeight()}, dur) : $obj.innerHeight(slider.slides.eq(slider.animatingTo).innerHeight());
}
},
sync: function(action) {
Expand Down Expand Up @@ -882,7 +898,7 @@
}());

if (slider.transitions) {
target = (vertical) ? "translate3d(0," + target + ",0)" : "translate3d(" + target + ",0,0)";
target = (vertical) ? "translate3d(0," + target + ",0)" : "translate3d(" + ((slider.vars.rtl?-1:1)*parseInt(target)+'px') + ",0,0)";
dur = (dur !== undefined) ? (dur/1000) + "s" : "0s";
slider.container.css("-" + slider.pfx + "-transition-duration", dur);
slider.container.css("transition-duration", dur);
Expand Down Expand Up @@ -937,13 +953,23 @@
slider.setProps(sliderOffset * slider.computedW, "init");
setTimeout(function(){
slider.doMath();
slider.newSlides.css({"width": slider.computedW, "marginRight" : slider.computedM, "float": "left", "display": "block"});
if(slider.vars.rtl){
slider.newSlides.css({"width": slider.computedW, "marginLeft" : slider.computedM, "float": "right", "display": "block"});
}
else{
slider.newSlides.css({"width": slider.computedW, "marginRight" : slider.computedM, "float": "left", "display": "block"});
}
// SMOOTH HEIGHT:
if (slider.vars.smoothHeight) { methods.smoothHeight(); }
}, (type === "init") ? 100 : 0);
}
} else { // FADE:
slider.slides.css({"width": "100%", "float": "left", "marginRight": "-100%", "position": "relative"});
if(slider.vars.rtl){
slider.slides.css({"width": "100%", "float": 'right', "marginLeft": "-100%", "position": "relative"});
}
else{
slider.slides.css({"width": "100%", "float": 'left', "marginRight": "-100%", "position": "relative"});
}
if (type === "init") {
if (!touch) {
//slider.slides.eq(slider.currentSlide).fadeIn(slider.vars.animationSpeed, slider.vars.easing);
Expand Down Expand Up @@ -1158,7 +1184,8 @@
end: function(){}, //Callback: function(slider) - Fires when the slider reaches the last slide (asynchronous)
added: function(){}, //{NEW} Callback: function(slider) - Fires after a slide is added
removed: function(){}, //{NEW} Callback: function(slider) - Fires after a slide is removed
init: function() {} //{NEW} Callback: function(slider) - Fires after the slider is initially setup
init: function() {}, //{NEW} Callback: function(slider) - Fires after the slider is initially setup
rtl: false //{NEW} Boolean: Whether or not to enable RTL mode
};

//FlexSlider: Plugin Function
Expand All @@ -1171,7 +1198,7 @@
selector = (options.selector) ? options.selector : ".slides > li",
$slides = $this.find(selector);

if ( ( $slides.length === 1 && options.allowOneSlide === true ) || $slides.length === 0 ) {
if ( ( $slides.length === 1 && options.allowOneSlide === false ) || $slides.length === 0 ) {
$slides.fadeIn(400);
if (options.start) { options.start($this); }
} else if ($this.data('flexslider') === undefined) {
Expand Down
1 change: 1 addition & 0 deletions parts/featured.php
View file
Expand Up @@ -40,6 +40,7 @@
pauseOnHover: true,
animationSpeed: 400,
smoothHeight: true,
rtl: <?php echo json_encode( is_rtl() ) ?>,
touch: <?php echo apply_filters('hu_flexslider_touch_support' , true); ?>,
slideshow: <?php echo hu_is_checked('featured-slideshow') ? 'true' : 'false'; ?>,
slideshowSpeed: <?php echo hu_get_option('featured-slideshow-speed', 5000); ?>,
Expand Down
1 change: 1 addition & 0 deletions parts/post-formats.php
View file
Expand Up @@ -90,6 +90,7 @@
clearInterval(checkforloaded);
$('#flexslider-<?php echo the_ID(); ?>').flexslider({
animation: '<?php echo wp_is_mobile() ? "slide" : "fade"; ?>',
rtl: <?php echo json_encode( is_rtl() ) ?>,
slideshow: true,
directionNav: true,
controlNav: true,
Expand Down

0 comments on commit c73b6f8

Please sign in to comment.