use window.onscroll instead of body.ontoucmoe

switer · Dec 7, 2013 · b493f01 · b493f01
1 parent 5563947
commit b493f01
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 22 deletions.
diff --git a/js/build/sui.js b/js/build/sui.js
@@ -620,43 +620,52 @@
   /**
      *   touch feedback
      */
-      
-  $(document).on( sui.touch.type('start') +' .sui-btn', function (e) {
-    var $tar = $(e.target);
+
+  $(document).on( sui.touch.type('start') +' .sui-btn', function (event) {
+    var $tar = $(event.target);
     if (!$tar.hasClass('sui-btn')) return;
 
-    var delay = 150;
 
-    $tar.off(sui.touch.type('move'), scrollHandler);
+    $(window).off('scroll', scrollHandler);
     $tar.off(sui.touch.type('end'), endHandler);
 
     if ($tar.data('noclick') == 'true') {
-      e.preventDefault();
+      event.preventDefault();
     }
 
     var isSroll = false,
-        isEnd = false;
+        isEnd = false,
+        isFeed = false,
+        delay = 150;
+
     function scrollHandler (e) {
-      $tar.off(sui.touch.type('move'), scrollHandler);
+      // touchstart trigger with touchmove
       isSroll = true;
+      $(window).off('scroll', scrollHandler);
       $tar.removeClass('on');
     }
     function endHandler (e) {
-      $tar.off(sui.touch.type('end'), endHandler);
       isEnd = true;
+      $tar.off(sui.touch.type('end'), endHandler);
+
+      if (isSroll) $tar.removeClass('on');
+
       setTimeout(function () {
-        $tar.removeClass('on');
+        isFeed && $tar.removeClass('on');
       }, delay);
     }
-    $tar.on(sui.touch.type('move'), scrollHandler);
+    $(window).on('scroll', scrollHandler);
     $tar.on(sui.touch.type('end'), endHandler);
 
     setTimeout(function () {
+      isFeed = true;
       !isSroll && $tar.addClass('on');
       if (!isEnd) return;
+
       setTimeout(function () {
         $tar.removeClass('on');
       }, delay);
+
     }, delay);
   });
 

diff --git a/js/component/ui.button.js b/js/component/ui.button.js
@@ -143,43 +143,52 @@
   /**
      *   touch feedback
      */
-      
-  $(document).on( sui.touch.type('start') +' .sui-btn', function (e) {
-    var $tar = $(e.target);
+
+  $(document).on( sui.touch.type('start') +' .sui-btn', function (event) {
+    var $tar = $(event.target);
     if (!$tar.hasClass('sui-btn')) return;
 
-    var delay = 150;
 
-    $tar.off(sui.touch.type('move'), scrollHandler);
+    $(window).off('scroll', scrollHandler);
     $tar.off(sui.touch.type('end'), endHandler);
 
     if ($tar.data('noclick') == 'true') {
-      e.preventDefault();
+      event.preventDefault();
     }
 
     var isSroll = false,
-        isEnd = false;
+        isEnd = false,
+        isFeed = false,
+        delay = 150;
+
     function scrollHandler (e) {
-      $tar.off(sui.touch.type('move'), scrollHandler);
+      // touchstart trigger with touchmove
       isSroll = true;
+      $(window).off('scroll', scrollHandler);
       $tar.removeClass('on');
     }
     function endHandler (e) {
-      $tar.off(sui.touch.type('end'), endHandler);
       isEnd = true;
+      $tar.off(sui.touch.type('end'), endHandler);
+
+      if (isSroll) $tar.removeClass('on');
+
       setTimeout(function () {
-        $tar.removeClass('on');
+        isFeed && $tar.removeClass('on');
       }, delay);
     }
-    $tar.on(sui.touch.type('move'), scrollHandler);
+    $(window).on('scroll', scrollHandler);
     $tar.on(sui.touch.type('end'), endHandler);
 
     setTimeout(function () {
+      isFeed = true;
       !isSroll && $tar.addClass('on');
       if (!isEnd) return;
+
       setTimeout(function () {
         $tar.removeClass('on');
       }, delay);
+
     }, delay);
   });