Skip to content
This repository has been archived by the owner on Oct 16, 2024. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: woocommerce/FlexSlider
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: spacecraftinc/FlexSlider
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: spacecraft-customizations
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Nov 16, 2017

  1. Copy the full SHA
    23a337d View commit details

Commits on Nov 17, 2017

  1. Copy the full SHA
    6dfc2a3 View commit details
  2. Copy the full SHA
    60a9fe5 View commit details
  3. Copy the full SHA
    5c5f26e View commit details
  4. Copy the full SHA
    fd5f479 View commit details
  5. Copy the full SHA
    db4efe5 View commit details
  6. Copy the full SHA
    70a6579 View commit details
  7. Copy the full SHA
    61289c3 View commit details
  8. Copy the full SHA
    b97b4fc View commit details
  9. add a .gitignore file

    RwwL committed Nov 17, 2017
    Copy the full SHA
    785917d View commit details
  10. Copy the full SHA
    bbe2839 View commit details
  11. Copy the full SHA
    4bb45f0 View commit details

Commits on Nov 20, 2017

  1. Copy the full SHA
    ba5663b View commit details
  2. add uglify-js as dev dependency, use it to write build:js script for …

    …minification, add build:js script to master build script, update .gitignore
    RwwL committed Nov 20, 2017
    Copy the full SHA
    6f85c9a View commit details
  3. Copy the full SHA
    16934dd View commit details
  4. Copy the full SHA
    15d02a0 View commit details
  5. Copy the full SHA
    2a0f699 View commit details
  6. clarify README for sc branch

    RwwL committed Nov 20, 2017
    Copy the full SHA
    8efe93b View commit details
  7. Copy the full SHA
    fd9d081 View commit details

Commits on Nov 21, 2017

  1. Copy the full SHA
    1482f39 View commit details
  2. Copy the full SHA
    adf19db View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    7e9c974 View commit details
  4. update customizations comment

    RwwL committed Nov 21, 2017
    Copy the full SHA
    faec3f2 View commit details
  5. Copy the full SHA
    44028d7 View commit details

Commits on Dec 1, 2017

  1. Copy the full SHA
    533c20d View commit details
  2. Copy the full SHA
    074ecf4 View commit details
  3. Copy the full SHA
    f2e0671 View commit details
  4. Copy the full SHA
    7ef7578 View commit details
  5. update version comment

    RwwL committed Dec 1, 2017
    Copy the full SHA
    7460083 View commit details
  6. Copy the full SHA
    ed79657 View commit details

Commits on Dec 15, 2017

  1. Copy the full SHA
    d0df131 View commit details

Commits on Feb 27, 2018

  1. fix positioning issues in setup when slider.visible > 1, re-call asNa…

    …v setup if needed after addSlide
    RwwL committed Feb 27, 2018
    Copy the full SHA
    4b8db16 View commit details
  2. Copy the full SHA
    4521e01 View commit details
  3. Copy the full SHA
    55050b0 View commit details
  4. Copy the full SHA
    52a483e View commit details
  5. build latest changes

    RwwL committed Feb 27, 2018
    Copy the full SHA
    bb9fd47 View commit details
  6. Copy the full SHA
    23f2209 View commit details
  7. bump version and rebuild

    RwwL committed Feb 27, 2018
    Copy the full SHA
    2391942 View commit details

Commits on Nov 21, 2024

  1. Copy the full SHA
    e3240bb View commit details
  2. Copy the full SHA
    ba68e0d View commit details

Commits on Nov 22, 2024

  1. Copy the full SHA
    dd7a53d View commit details
  2. Copy the full SHA
    bfbdcf1 View commit details

Commits on Nov 25, 2024

  1. Copy the full SHA
    7528920 View commit details
Showing with 670 additions and 33,606 deletions.
  1. +1 −0 .gitignore
  2. +9 −6 README.md
  3. +49 −20 demo/js/jquery.flexslider.js
  4. +13 −2 jquery.flexslider-min.js
  5. +49 −20 jquery.flexslider.js
  6. +0 −3 node_modules/jquery/.bowerrc
  7. +0 −5 node_modules/jquery/.jscsrc
  8. +0 −14 node_modules/jquery/.npmignore
  9. +0 −217 node_modules/jquery/AUTHORS.txt
  10. +0 −214 node_modules/jquery/CONTRIBUTING.md
  11. +0 −21 node_modules/jquery/MIT-LICENSE.txt
  12. +0 −368 node_modules/jquery/README.md
  13. +0 −28 node_modules/jquery/bower.json
  14. +0 −10,351 node_modules/jquery/dist/jquery.js
  15. +0 −6 node_modules/jquery/dist/jquery.min.js
  16. +0 −1 node_modules/jquery/dist/jquery.min.map
  17. +0 −89 node_modules/jquery/package.json
  18. +0 −801 node_modules/jquery/src/ajax.js
  19. +0 −89 node_modules/jquery/src/ajax/jsonp.js
  20. +0 −75 node_modules/jquery/src/ajax/load.js
  21. +0 −51 node_modules/jquery/src/ajax/parseJSON.js
  22. +0 −31 node_modules/jquery/src/ajax/parseXML.js
  23. +0 −93 node_modules/jquery/src/ajax/script.js
  24. +0 −5 node_modules/jquery/src/ajax/var/nonce.js
  25. +0 −3 node_modules/jquery/src/ajax/var/rquery.js
  26. +0 −197 node_modules/jquery/src/ajax/xhr.js
  27. +0 −11 node_modules/jquery/src/attributes.js
  28. +0 −271 node_modules/jquery/src/attributes/attr.js
  29. +0 −157 node_modules/jquery/src/attributes/classes.js
  30. +0 −134 node_modules/jquery/src/attributes/prop.js
  31. +0 −62 node_modules/jquery/src/attributes/support.js
  32. +0 −178 node_modules/jquery/src/attributes/val.js
  33. +0 −205 node_modules/jquery/src/callbacks.js
  34. +0 −540 node_modules/jquery/src/core.js
  35. +0 −60 node_modules/jquery/src/core/access.js
  36. +0 −132 node_modules/jquery/src/core/init.js
  37. +0 −39 node_modules/jquery/src/core/parseHTML.js
  38. +0 −152 node_modules/jquery/src/core/ready.js
  39. +0 −4 node_modules/jquery/src/core/var/rsingleTag.js
  40. +0 −504 node_modules/jquery/src/css.js
  41. +0 −32 node_modules/jquery/src/css/addGetHookIf.js
  42. +0 −124 node_modules/jquery/src/css/curCSS.js
  43. +0 −69 node_modules/jquery/src/css/defaultDisplay.js
  44. +0 −20 node_modules/jquery/src/css/hiddenVisibleSelectors.js
  45. +0 −151 node_modules/jquery/src/css/support.js
  46. +0 −28 node_modules/jquery/src/css/swap.js
  47. +0 −3 node_modules/jquery/src/css/var/cssExpand.js
  48. +0 −13 node_modules/jquery/src/css/var/isHidden.js
  49. +0 −3 node_modules/jquery/src/css/var/rmargin.js
  50. +0 −5 node_modules/jquery/src/css/var/rnumnonpx.js
  51. +0 −335 node_modules/jquery/src/data.js
  52. +0 −21 node_modules/jquery/src/data/accepts.js
  53. +0 −25 node_modules/jquery/src/data/support.js
  54. +0 −150 node_modules/jquery/src/deferred.js
  55. +0 −13 node_modules/jquery/src/deprecated.js
  56. +0 −50 node_modules/jquery/src/dimensions.js
  57. +0 −656 node_modules/jquery/src/effects.js
  58. +0 −114 node_modules/jquery/src/effects/Tween.js
  59. +0 −13 node_modules/jquery/src/effects/animatedSelector.js
  60. +0 −55 node_modules/jquery/src/effects/support.js
  61. +0 −1,037 node_modules/jquery/src/event.js
  62. +0 −13 node_modules/jquery/src/event/ajax.js
  63. +0 −39 node_modules/jquery/src/event/alias.js
  64. +0 −26 node_modules/jquery/src/event/support.js
  65. +0 −24 node_modules/jquery/src/exports/amd.js
  66. +0 −32 node_modules/jquery/src/exports/global.js
  67. +0 −44 node_modules/jquery/src/intro.js
  68. +0 −38 node_modules/jquery/src/jquery.js
  69. +0 −744 node_modules/jquery/src/manipulation.js
  70. +0 −18 node_modules/jquery/src/manipulation/_evalUrl.js
  71. +0 −76 node_modules/jquery/src/manipulation/support.js
  72. +0 −3 node_modules/jquery/src/manipulation/var/rcheckableType.js
  73. +0 −211 node_modules/jquery/src/offset.js
  74. +0 −1 node_modules/jquery/src/outro.js
  75. +0 −142 node_modules/jquery/src/queue.js
  76. +0 −22 node_modules/jquery/src/queue/delay.js
  77. +0 −14 node_modules/jquery/src/selector-sizzle.js
  78. +0 −1 node_modules/jquery/src/selector.js
  79. +0 −110 node_modules/jquery/src/serialize.js
  80. +0 −2,067 node_modules/jquery/src/sizzle/dist/sizzle.js
  81. +0 −3 node_modules/jquery/src/sizzle/dist/sizzle.min.js
  82. +0 −1 node_modules/jquery/src/sizzle/dist/sizzle.min.map
  83. 0 node_modules/jquery/src/sizzle/test/data/empty.js
  84. +0 −22 node_modules/jquery/src/sizzle/test/data/mixed_sort.html
  85. +0 −136 node_modules/jquery/src/sizzle/test/data/testinit.js
  86. +0 −242 node_modules/jquery/src/sizzle/test/index.html
  87. +0 −9,597 node_modules/jquery/src/sizzle/test/jquery.js
  88. +0 −95 node_modules/jquery/src/sizzle/test/unit/extending.js
  89. +0 −1,149 node_modules/jquery/src/sizzle/test/unit/selector.js
  90. +0 −169 node_modules/jquery/src/sizzle/test/unit/utilities.js
  91. +0 −58 node_modules/jquery/src/support.js
  92. +0 −200 node_modules/jquery/src/traversing.js
  93. +0 −100 node_modules/jquery/src/traversing/findFilter.js
  94. +0 −6 node_modules/jquery/src/traversing/var/rneedsContext.js
  95. +0 −4 node_modules/jquery/src/var/class2type.js
  96. +0 −5 node_modules/jquery/src/var/concat.js
  97. +0 −3 node_modules/jquery/src/var/deletedIds.js
  98. +0 −5 node_modules/jquery/src/var/hasOwn.js
  99. +0 −5 node_modules/jquery/src/var/indexOf.js
  100. +0 −3 node_modules/jquery/src/var/pnum.js
  101. +0 −5 node_modules/jquery/src/var/push.js
  102. +0 −3 node_modules/jquery/src/var/rnotwhite.js
  103. +0 −5 node_modules/jquery/src/var/slice.js
  104. +0 −3 node_modules/jquery/src/var/strundefined.js
  105. +0 −4 node_modules/jquery/src/var/support.js
  106. +0 −5 node_modules/jquery/src/var/toString.js
  107. +0 −76 node_modules/jquery/src/wrap.js
  108. +9 −1 package.json
  109. +540 −0 yarn.lock
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
15 changes: 9 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# No longer under active development
# FlexSlider 2.7.2 - SpaceCraft customizations branch

Please note that this repository is no longer actively developed. See [the discussion](https://github.com/woocommerce/woocommerce/discussions/48302). The most recent version of FlexSlider is currently incubated
[within WooCommerce](https://github.com/woocommerce/woocommerce/blob/trunk/plugins/woocommerce/client/legacy/js/flexslider/jquery.flexslider.js).
This repo is for SpaceCraft customizations to FlexSlider (detailed in `@preserve` comment in `jquery.flexslider.js`).

[![Gitter chat](https://badges.gitter.im/woothemes/FlexSlider.png)](https://gitter.im/woothemes/FlexSlider)
No source changes will be coming from upstream, per the upstream README:

# FlexSlider 2.7.2
http://www.woocommerce.com/flexslider/ - Copyright (c) 2015 WooThemes
> Please note that this repository is no longer actively developed. See [the discussion](https://github.com/woocommerce/woocommerce/discussions/48302). The most recent version of FlexSlider is currently incubated
> [within WooCommerce](https://github.com/woocommerce/woocommerce/blob/trunk/plugins/woocommerce/client/legacy/js/flexslider/jquery.flexslider.js).
SpaceCraft/W360 deployments can/should be prepped with `npm run build`, which minifies `jquery.flexslider.js`, builds the LESS source into CSS, and copies the built CSS and JS into the appropriate spot in the demo project.

http://www.woothemes.com/flexslider/ - Copyright (c) 2015 WooThemes

## Releases

69 changes: 49 additions & 20 deletions demo/js/jquery.flexslider.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
/*
/* @preserve
* jQuery FlexSlider v2.7.2
* Copyright 2012 WooThemes
* Contributing Author: Tyler Smith
SC customizations 0.8:
- added swiping flag
- improved itemMargin consideration in carousel's slider.visible calculation
- fixed animationLoop logic disabling nav buttons
- fix positioning issues in setup when slider.visible > 1
- re-call asNav setup if needed after addSlide
- add array-of-items support to addSlide
- replace deprecated jQuery 3.x event handling methods .bind, .unbind, and .delegate
- replace deprecated jQuery 3.x focus/blur event shorthands
*/
;
(function ($) {
@@ -104,7 +114,7 @@

// KEYBOARD:
if (slider.vars.keyboard && ($(slider.containerSelector).length === 1 || slider.vars.multipleKeyboard)) {
$(document).bind('keyup', function(event) {
$(document).on('keyup', function(event) {
var keycode = event.keyCode;
if (!slider.animating && (keycode === 39 || keycode === 37)) {
var target = (slider.vars.rtl?
@@ -121,7 +131,7 @@
}
// MOUSEWHEEL:
if (slider.vars.mousewheel) {
slider.bind('mousewheel', function(event, delta, deltaX, deltaY) {
slider.on('mousewheel', function(event, delta, deltaX, deltaY) {
event.preventDefault();
var target = (delta < 0) ? slider.getTarget('next') : slider.getTarget('prev');
slider.flexAnimate(target, slider.vars.pauseOnAction);
@@ -157,7 +167,7 @@
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).on("resize orientationchange focus", methods.resize); }

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

@@ -175,6 +185,9 @@
if(!msGesture){
slider.slides.on(eventType, function(e){
e.preventDefault();
if (slider.swiping) {
return;
}
var $slide = $(this),
target = $slide.index();
var posFromX;
@@ -206,6 +219,9 @@
}, false);
that.addEventListener("MSGestureTap", function (e){
e.preventDefault();
if (slider.swiping) {
return;
}
var $slide = $(this),
target = $slide.index();
if (!$(slider.vars.asNavFor).data('flexslider').animating && !$slide.hasClass('active')) {
@@ -274,7 +290,7 @@

methods.controlNav.active();

slider.controlNavScaffold.delegate('a, img', eventType, function(event) {
slider.controlNavScaffold.on(eventType, 'a, img', function(event) {
event.preventDefault();

if (watchedEvent === "" || watchedEvent === event.type) {
@@ -299,7 +315,7 @@
slider.controlNav = slider.manualControls;
methods.controlNav.active();

slider.controlNav.bind(eventType, function(event) {
slider.controlNav.on(eventType, function(event) {
event.preventDefault();

if (watchedEvent === "" || watchedEvent === event.type) {
@@ -356,7 +372,7 @@

methods.directionNav.update();

slider.directionNav.bind(eventType, function(event) {
slider.directionNav.on(eventType, function(event) {
event.preventDefault();
var target;

@@ -404,7 +420,7 @@

methods.pausePlay.update((slider.vars.slideshow) ? namespace + 'pause' : namespace + 'play');

slider.pausePlay.bind(eventType, function(event) {
slider.pausePlay.on(eventType, function(event) {
event.preventDefault();

if (watchedEvent === "" || watchedEvent === event.type) {
@@ -473,6 +489,9 @@
};

onTouchMove = function(e) {

slider.swiping = true;

// Local vars for X and Y points.

localX = e.touches[0].pageX;
@@ -497,6 +516,8 @@
// finish the touch by undoing the touch session
el.removeEventListener('touchmove', onTouchMove, false);

slider.swiping = false;

if (slider.animatingTo === slider.currentSlide && !scrolling && !(dx === null)) {
var updateDx = (reverse) ? -dx : dx,
target = (updateDx > 0) ? slider.getTarget('next') : slider.getTarget('prev');
@@ -551,6 +572,7 @@
if(!slider){
return;
}
slider.swiping = true;
var transX = -e.translationX,
transY = -e.translationY;

@@ -584,6 +606,7 @@
if(!slider){
return;
}
slider.swiping = false;
if (slider.animatingTo === slider.currentSlide && !scrolling && !(dx === null)) {
var updateDx = (reverse) ? -dx : dx,
target = (updateDx > 0) ? slider.getTarget('next') : slider.getTarget('prev');
@@ -794,8 +817,8 @@
}

// Unbind previous transitionEnd events and re-bind new transitionEnd event
slider.container.unbind("webkitTransitionEnd transitionend");
slider.container.bind("webkitTransitionEnd transitionend", function() {
slider.container.off("webkitTransitionEnd transitionend");
slider.container.on("webkitTransitionEnd transitionend", function() {
clearTimeout(slider.ensureAnimationEnd);
slider.wrapup(dimension);
});
@@ -877,8 +900,8 @@
(asNav && slider.currentItem === 0 && target === slider.pagingCount - 1 && slider.direction !== "next") ? false :
(target === slider.currentSlide && !asNav) ? false :
(slider.vars.animationLoop) ? true :
(slider.atEnd && slider.currentSlide === 0 && target === last && slider.direction !== "next") ? false :
(slider.atEnd && slider.currentSlide === last && target === 0 && slider.direction === "next") ? false :
(slider.atEnd && slider.currentSlide === 0 && target === last && slider.direction === "next") ? false :
(slider.atEnd && slider.currentSlide === last && target === 0 && slider.direction !== "next") ? false :
true;
};
slider.getTarget = function(dir) {
@@ -959,7 +982,11 @@
}
slider.newSlides = $(slider.vars.selector, slider);

sliderOffset = (reverse) ? slider.count - 1 - slider.currentSlide + slider.cloneOffset : slider.currentSlide + slider.cloneOffset;
var trueCurrent = slider.currentSlide;
if (slider.visible > 1) {
trueCurrent = slider.currentSlide * slider.visible;
}
sliderOffset = (reverse) ? slider.count - 1 - trueCurrent + slider.cloneOffset : trueCurrent + slider.cloneOffset;
// VERTICAL:
if (vertical && !carousel) {
slider.container.height((slider.count + slider.cloneCount) * 200 + "%").css("position", "absolute").width("100%");
@@ -1040,7 +1067,8 @@
(slider.maxW < slider.w) ? (slider.w - (slideMargin * (maxItems - 1)))/maxItems :
(slider.vars.itemWidth > slider.w) ? slider.w : slider.vars.itemWidth;

slider.visible = Math.floor(slider.w/(slider.itemW));
slider.visible = (maxItems === 0) ? Math.max(Math.floor(slider.w/(slider.itemW + slideMargin)), 1) :
Math.floor(slider.w/(slider.itemW));
slider.move = (slider.vars.move > 0 && slider.vars.move < slider.visible ) ? slider.vars.move : slider.visible;
slider.pagingCount = Math.ceil(((slider.count - slider.visible)/slider.move) + 1);
slider.last = slider.pagingCount - 1;
@@ -1089,7 +1117,7 @@
slider.addSlide = function(obj, pos) {
var $obj = $(obj);

slider.count += 1;
slider.count += $obj.length;
slider.last = slider.count - 1;

// append new slide
@@ -1106,6 +1134,7 @@
slider.slides = $(slider.vars.selector + ':not(.clone)', slider);
// re-setup the slider to accomdate new slide
slider.setup();
if (asNav) { methods.asNav.setup(); }

//FlexSlider: added() Callback
slider.vars.added(slider);
@@ -1142,9 +1171,9 @@
};

// Ensure the slider isn't focussed if the window loses focus.
$( window ).blur( function ( e ) {
$( window ).on('blur', function ( e ) {
focused = false;
}).focus( function ( e ) {
}).on('focus', function ( e ) {
focused = true;
});

@@ -1213,9 +1242,9 @@
after: function(){}, //Callback: function(slider) - Fires after each slider animation completes
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
rtl: false //{NEW} Boolean: Whether or not to enable RTL mode
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
rtl: false //{NEW} Boolean: Whether or not to enable RTL mode
};

//FlexSlider: Plugin Function
Loading