Merge pull request #238 from xieyu33333/master

fix fixPage bug
be-fe · Aug 2, 2015 · af88493 · af88493
2 parents f27e424 + f17611b
commit af88493
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/build/islider.js b/build/islider.js
@@ -47,7 +47,11 @@ iSlider = function () {
     // start from initIndex or 0
     this.initIndex = opts.initIndex || 0;
     // touchstart prevent default to fixPage
-    this.fixPage = opts.fixPage || true;
+    if (opts.fixPage === undefined) {
+      this.fixPage = true;
+    } else {
+      this.fixPage = opts.fixPage;
+    }
     if (this.initIndex > this.data.length - 1 || this.initIndex < 0) {
       this.initIndex = 0;
     }

diff --git a/build/islider_core.js b/build/islider_core.js
@@ -47,7 +47,11 @@ iSlider = function () {
     // start from initIndex or 0
     this.initIndex = opts.initIndex || 0;
     // touchstart prevent default to fixPage
-    this.fixPage = opts.fixPage || true;
+    if (opts.fixPage === undefined) {
+      this.fixPage = true;
+    } else {
+      this.fixPage = opts.fixPage;
+    }
     if (this.initIndex > this.data.length - 1 || this.initIndex < 0) {
       this.initIndex = 0;
     }

diff --git a/demo/public/js/islider.js b/demo/public/js/islider.js
@@ -47,7 +47,11 @@ iSlider = function () {
     // start from initIndex or 0
     this.initIndex = opts.initIndex || 0;
     // touchstart prevent default to fixPage
-    this.fixPage = opts.fixPage || true;
+    if (opts.fixPage === undefined) {
+      this.fixPage = true;
+    } else {
+      this.fixPage = opts.fixPage;
+    }
     if (this.initIndex > this.data.length - 1 || this.initIndex < 0) {
       this.initIndex = 0;
     }

diff --git a/demo/public/js/islider_core.js b/demo/public/js/islider_core.js
@@ -47,7 +47,11 @@ iSlider = function () {
     // start from initIndex or 0
     this.initIndex = opts.initIndex || 0;
     // touchstart prevent default to fixPage
-    this.fixPage = opts.fixPage || true;
+    if (opts.fixPage === undefined) {
+      this.fixPage = true;
+    } else {
+      this.fixPage = opts.fixPage;
+    }
     if (this.initIndex > this.data.length - 1 || this.initIndex < 0) {
       this.initIndex = 0;
     }

diff --git a/src/islider_core.js b/src/islider_core.js
@@ -51,7 +51,12 @@ define('iSlider', [], function () {
         // start from initIndex or 0
         this.initIndex = opts.initIndex || 0;
         // touchstart prevent default to fixPage
-        this.fixPage = opts.fixPage || true;
+        if (opts.fixPage === undefined) {
+            this.fixPage = true;
+        }
+        else {
+            this.fixPage = opts.fixPage;
+        }
 
         if  (this.initIndex > this.data.length - 1 || this.initIndex < 0) {
             this.initIndex = 0;