Merge pull request #186 from xieyu33333/master

touchstart default preventDefault
be-fe · Feb 28, 2015 · c70bbf5 · c70bbf5
2 parents acb3e7a + b9f0214
commit c70bbf5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/build/islider.js b/build/islider.js
@@ -44,8 +44,10 @@ iSlider = function () {
     this.isOverspread = opts.isOverspread || false;
     // Play time gap
     this.duration = opts.duration || 2000;
-    // start from initIndex or 0
+    // start from initIndex or 0 
     this.initIndex = opts.initIndex || 0;
+    // touchstart prevent default to fixPage 
+    this.fixPage = opts.fixPage || true;
     if (this.initIndex > this.data.length - 1 || this.initIndex < 0) {
       this.initIndex = 0;
     }
@@ -432,7 +434,7 @@ iSlider = function () {
   *  @param {Object}   evt   event obj
   */
   iSlider.prototype.startHandler = function (evt) {
-    if (this._opts.fixPage) {
+    if (this.fixPage) {
       evt.preventDefault();
     }
     var device = this._device();

diff --git a/build/islider_core.js b/build/islider_core.js
@@ -44,8 +44,10 @@ iSlider = function () {
     this.isOverspread = opts.isOverspread || false;
     // Play time gap
     this.duration = opts.duration || 2000;
-    // start from initIndex or 0
+    // start from initIndex or 0 
     this.initIndex = opts.initIndex || 0;
+    // touchstart prevent default to fixPage 
+    this.fixPage = opts.fixPage || true;
     if (this.initIndex > this.data.length - 1 || this.initIndex < 0) {
       this.initIndex = 0;
     }
@@ -432,7 +434,7 @@ iSlider = function () {
   *  @param {Object}   evt   event obj
   */
   iSlider.prototype.startHandler = function (evt) {
-    if (this._opts.fixPage) {
+    if (this.fixPage) {
       evt.preventDefault();
     }
     var device = this._device();

diff --git a/demo/public/js/islider.js b/demo/public/js/islider.js
@@ -44,8 +44,10 @@ iSlider = function () {
     this.isOverspread = opts.isOverspread || false;
     // Play time gap
     this.duration = opts.duration || 2000;
-    // start from initIndex or 0
+    // start from initIndex or 0 
     this.initIndex = opts.initIndex || 0;
+    // touchstart prevent default to fixPage 
+    this.fixPage = opts.fixPage || true;
     if (this.initIndex > this.data.length - 1 || this.initIndex < 0) {
       this.initIndex = 0;
     }
@@ -432,7 +434,7 @@ iSlider = function () {
   *  @param {Object}   evt   event obj
   */
   iSlider.prototype.startHandler = function (evt) {
-    if (this._opts.fixPage) {
+    if (this.fixPage) {
       evt.preventDefault();
     }
     var device = this._device();

diff --git a/demo/public/js/islider_core.js b/demo/public/js/islider_core.js
@@ -44,8 +44,10 @@ iSlider = function () {
     this.isOverspread = opts.isOverspread || false;
     // Play time gap
     this.duration = opts.duration || 2000;
-    // start from initIndex or 0
+    // start from initIndex or 0 
     this.initIndex = opts.initIndex || 0;
+    // touchstart prevent default to fixPage 
+    this.fixPage = opts.fixPage || true;
     if (this.initIndex > this.data.length - 1 || this.initIndex < 0) {
       this.initIndex = 0;
     }
@@ -432,7 +434,7 @@ iSlider = function () {
   *  @param {Object}   evt   event obj
   */
   iSlider.prototype.startHandler = function (evt) {
-    if (this._opts.fixPage) {
+    if (this.fixPage) {
       evt.preventDefault();
     }
     var device = this._device();

diff --git a/src/islider_core.js b/src/islider_core.js
@@ -50,6 +50,9 @@ define('iSlider', [], function () {
         this.duration = opts.duration || 2000;
         // start from initIndex or 0
         this.initIndex = opts.initIndex || 0;
+        // touchstart prevent default to fixPage
+        this.fixPage = opts.fixPage || true;
+
         if  (this.initIndex > this.data.length - 1 || this.initIndex < 0) {
             this.initIndex = 0;
         }
@@ -483,7 +486,7 @@ define('iSlider', [], function () {
     *  @param {Object}   evt   event obj
     */
     iSlider.prototype.startHandler = function (evt) {
-        if (this._opts.fixPage) {
+        if (this.fixPage) {
             evt.preventDefault();
         }
         var device = this._device();