You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2018/04/28 02:39:48 UTC

[1/2] incubator-weex git commit: [WEEX-299][android] Touch event will transmit to next layer, requestDisallowInterceptTouchEvent should be reset for every touch event

Repository: incubator-weex
Updated Branches:
  refs/heads/master cfefd7b64 -> 56e23de83


[WEEX-299][android] Touch event will transmit to next layer, requestDisallowInterceptTouchEvent should be reset for every touch event


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5575e161
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5575e161
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5575e161

Branch: refs/heads/master
Commit: 5575e161add04239d26a6a9b02fe9e3dc611bdc4
Parents: 21aa9ab
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Fri Apr 27 16:47:13 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Fri Apr 27 16:47:13 2018 +0800

----------------------------------------------------------------------
 .../src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5575e161/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
index 3335d9e..954d118 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
@@ -160,6 +160,7 @@ public class WXGesture extends GestureDetector.SimpleOnGestureListener implement
   @Override
   public boolean onTouch(View v, MotionEvent event) {
     if(requestDisallowInterceptTouchEvent){
+      requestDisallowInterceptTouchEvent = false;
       return false;
     }
     try {


[2/2] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr1138' into apache-master

Posted by mi...@apache.org.
Merge remote-tracking branch 'upstream/pr1138' into apache-master


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/56e23de8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/56e23de8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/56e23de8

Branch: refs/heads/master
Commit: 56e23de83b4b58f221ac202e77676079f269f4da
Parents: cfefd7b 5575e16
Author: misakuo <mi...@apache.org>
Authored: Sat Apr 28 10:39:38 2018 +0800
Committer: misakuo <mi...@apache.org>
Committed: Sat Apr 28 10:39:38 2018 +0800

----------------------------------------------------------------------
 .../src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------