Merge pull request #735 from meandmax/benmerckx-master

Add trigger commit to fix from @benmerckx
loryjs · Jun 4, 2018 · d7c0b2e · d7c0b2e
2 parents ced88f1 + 37da719
commit d7c0b2e
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 100 deletions.
diff --git a/dist/jquery.lory.js b/dist/jquery.lory.js
@@ -242,6 +242,13 @@ function lory(slider, opts) {
         }
     }
 
+    /**
+     * returns an element's width
+     */
+    function elementWidth(element) {
+        return element.getBoundingClientRect().width || element.offsetWidth;
+    }
+
     /**
      * slidefunction called by prev, next & touchend
      *
@@ -448,12 +455,12 @@ function lory(slider, opts) {
             initialIndex = _options5.initialIndex;
 
 
-        slidesWidth = slideContainer.getBoundingClientRect().width || slideContainer.offsetWidth;
-        frameWidth = frame.getBoundingClientRect().width || frame.offsetWidth;
+        slidesWidth = elementWidth(slideContainer);
+        frameWidth = elementWidth(frame);
 
         if (frameWidth === slidesWidth) {
             slidesWidth = slides.reduce(function (previousValue, slide) {
-                return previousValue + slide.getBoundingClientRect().width || slide.offsetWidth;
+                return previousValue + elementWidth(slide);
             }, 0);
         }
 
@@ -687,11 +694,13 @@ function lory(slider, opts) {
     }
 
     function onResize(event) {
-        reset();
+        if (frameWidth !== elementWidth(frame)) {
+            reset();
 
-        dispatchSliderEvent('on', 'resize', {
-            event: event
-        });
+            dispatchSliderEvent('on', 'resize', {
+                event: event
+            });
+        }
     }
 
     // trigger initial setup

diff --git a/dist/jquery.lory.min.js b/dist/jquery.lory.min.js
diff --git a/dist/jquery.lory.min.js.map b/dist/jquery.lory.min.js.map
diff --git a/dist/lory.js b/dist/lory.js
@@ -242,6 +242,13 @@ function lory(slider, opts) {
         }
     }
 
+    /**
+     * returns an element's width
+     */
+    function elementWidth(element) {
+        return element.getBoundingClientRect().width || element.offsetWidth;
+    }
+
     /**
      * slidefunction called by prev, next & touchend
      *
@@ -448,12 +455,12 @@ function lory(slider, opts) {
             initialIndex = _options5.initialIndex;
 
 
-        slidesWidth = slideContainer.getBoundingClientRect().width || slideContainer.offsetWidth;
-        frameWidth = frame.getBoundingClientRect().width || frame.offsetWidth;
+        slidesWidth = elementWidth(slideContainer);
+        frameWidth = elementWidth(frame);
 
         if (frameWidth === slidesWidth) {
             slidesWidth = slides.reduce(function (previousValue, slide) {
-                return previousValue + slide.getBoundingClientRect().width || slide.offsetWidth;
+                return previousValue + elementWidth(slide);
             }, 0);
         }
 
@@ -687,11 +694,13 @@ function lory(slider, opts) {
     }
 
     function onResize(event) {
-        reset();
+        if (frameWidth !== elementWidth(frame)) {
+            reset();
 
-        dispatchSliderEvent('on', 'resize', {
-            event: event
-        });
+            dispatchSliderEvent('on', 'resize', {
+                event: event
+            });
+        }
     }
 
     // trigger initial setup

diff --git a/dist/lory.min.js b/dist/lory.min.js
diff --git a/dist/lory.min.js.map b/dist/lory.min.js.map
diff --git a/src/lory.js b/src/lory.js
@@ -111,6 +111,13 @@ export function lory (slider, opts) {
         }
     }
 
+    /**
+     * returns an element's width
+     */
+    function elementWidth (element) {
+        return element.getBoundingClientRect().width || element.offsetWidth;
+    }
+
     /**
      * slidefunction called by prev, next & touchend
      *
@@ -311,14 +318,12 @@ export function lory (slider, opts) {
     function reset () {
         var {infinite, ease, rewindSpeed, rewindOnResize, classNameActiveSlide, initialIndex} = options;
 
-        slidesWidth = slideContainer.getBoundingClientRect()
-            .width || slideContainer.offsetWidth;
-        frameWidth = frame.getBoundingClientRect()
-            .width || frame.offsetWidth;
+        slidesWidth = elementWidth(slideContainer);
+        frameWidth = elementWidth(frame);
 
         if (frameWidth === slidesWidth) {
             slidesWidth = slides.reduce(function (previousValue, slide) {
-                return previousValue + slide.getBoundingClientRect().width || slide.offsetWidth;
+                return previousValue + elementWidth(slide);
             }, 0);
         }
 
@@ -549,11 +554,13 @@ export function lory (slider, opts) {
     }
 
     function onResize (event) {
-        reset();
+        if (frameWidth !== elementWidth(frame)) {
+            reset();
 
-        dispatchSliderEvent('on', 'resize', {
-            event
-        });
+            dispatchSliderEvent('on', 'resize', {
+                event
+            });
+        }
     }
 
     // trigger initial setup