Merge pull request #733 from meandmax/drewfranklin-master

Little fixes & Merge PR from Drew Franklin
loryjs · Jun 3, 2018 · ced88f1 · ced88f1
2 parents 62b81e5 + 9694359
commit ced88f1
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ npm-debug.log
 
 .AppleDouble/
 .DS_Store
+yarn-error.log
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,6 @@
+/*
+
+!/package.json
+!/README.md
+!/dist/**/*
+!/src/**/*
diff --git a/dist/jquery.lory.js b/dist/jquery.lory.js
@@ -283,9 +283,17 @@ function lory(slider, opts) {
 
         if (typeof nextIndex !== 'number') {
             if (direction) {
-                nextIndex = index + slidesToScroll;
+                if (infinite && index + infinite * 2 !== slides.length) {
+                    nextIndex = index + (infinite - index % infinite);
+                } else {
+                    nextIndex = index + slidesToScroll;
+                }
             } else {
-                nextIndex = index - slidesToScroll;
+                if (infinite && index % infinite !== 0) {
+                    nextIndex = index - index % infinite;
+                } else {
+                    nextIndex = index - slidesToScroll;
+                }
             }
         }
 
@@ -321,7 +329,7 @@ function lory(slider, opts) {
             index = nextIndex;
         }
 
-        if (infinite && (nextIndex === slides.length - infinite || nextIndex === 0)) {
+        if (infinite && (nextIndex === slides.length - infinite || nextIndex === slides.length - slides.length % infinite || nextIndex === 0)) {
             if (direction) {
                 index = infinite;
             }

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
@@ -283,9 +283,17 @@ function lory(slider, opts) {
 
         if (typeof nextIndex !== 'number') {
             if (direction) {
-                nextIndex = index + slidesToScroll;
+                if (infinite && index + infinite * 2 !== slides.length) {
+                    nextIndex = index + (infinite - index % infinite);
+                } else {
+                    nextIndex = index + slidesToScroll;
+                }
             } else {
-                nextIndex = index - slidesToScroll;
+                if (infinite && index % infinite !== 0) {
+                    nextIndex = index - index % infinite;
+                } else {
+                    nextIndex = index - slidesToScroll;
+                }
             }
         }
 
@@ -321,7 +329,7 @@ function lory(slider, opts) {
             index = nextIndex;
         }
 
-        if (infinite && (nextIndex === slides.length - infinite || nextIndex === 0)) {
+        if (infinite && (nextIndex === slides.length - infinite || nextIndex === slides.length - slides.length % infinite || nextIndex === 0)) {
             if (direction) {
                 index = infinite;
             }

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/index.html b/index.html
@@ -624,7 +624,7 @@ <h2>Run tests</h2>
 
 </code></pre></div>
 
-        <img class="testscreen" src="http://maximilian-heinz.de/test.png" />
+        <img class="testscreen" src="./static/tests.png" />
         </section>
 
         <section class="api">

diff --git a/src/lory.js b/src/lory.js
@@ -152,9 +152,17 @@ export function lory (slider, opts) {
 
         if (typeof nextIndex !== 'number') {
             if (direction) {
-                nextIndex = index + slidesToScroll;
+              if (infinite && index + (infinite * 2) !== slides.length) {
+                  nextIndex = index + (infinite - index % infinite);
+              } else {
+                  nextIndex = index + slidesToScroll;
+              }
             } else {
-                nextIndex = index - slidesToScroll;
+              if (infinite && index % infinite !== 0) {
+                  nextIndex = index - index % infinite;
+              } else {
+                  nextIndex = index - slidesToScroll;
+              }
             }
         }
 
@@ -190,7 +198,8 @@ export function lory (slider, opts) {
             index = nextIndex;
         }
 
-        if (infinite && (nextIndex === slides.length - infinite || nextIndex === 0)) {
+        if (infinite && (nextIndex === slides.length - infinite ||
+            nextIndex === slides.length - slides.length % infinite || nextIndex === 0)) {
             if (direction) {
                 index = infinite;
             }

diff --git a/static/app.css b/static/app.css
@@ -125,7 +125,7 @@ tr {
 }
 
 section {
-    padding: 40px 0;
+    padding: 40px 0 0 0;
 }
 
 section:nth-child(odd) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ npm-debug.log

		.AppleDouble/
		.DS_Store
		yarn-error.log