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/03/01 08:15:33 UTC
[1/3] incubator-weex git commit: [WEEX-228][android]
ShouldStopPropagation Use ShortName StopPropagation
Repository: incubator-weex
Updated Branches:
refs/heads/master b948d6855 -> a3a05f089
[WEEX-228][android] ShouldStopPropagation Use ShortName StopPropagation
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1c429f25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1c429f25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1c429f25
Branch: refs/heads/master
Commit: 1c429f25a5ca49d546a5ed3188bac96943ae5722
Parents: 95e16d8
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Tue Feb 27 11:33:42 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Tue Feb 27 11:33:42 2018 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/common/Constants.java | 2 +-
.../java/com/taobao/weex/ui/component/WXComponent.java | 2 +-
.../java/com/taobao/weex/ui/view/gesture/WXGesture.java | 11 ++++++-----
3 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1c429f25/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
index 64b59c8..ab1c808 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@ -323,7 +323,7 @@ public class Constants {
}
- String SHOULD_STOP_PROPAGATION = "shouldStopPropagation";
+ String STOP_PROPAGATION = "stopPropagation";
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1c429f25/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index 9651cd7..0fa4eee 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -1161,7 +1161,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
}
}
}
- if(Constants.Event.SHOULD_STOP_PROPAGATION.equals(type)){
+ if(Constants.Event.STOP_PROPAGATION.equals(type)){
return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1c429f25/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 3c610aa..1bac140 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
@@ -49,7 +49,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static com.taobao.weex.common.Constants.Event.SHOULD_STOP_PROPAGATION;
+import static com.taobao.weex.common.Constants.Event.STOP_PROPAGATION;
public class WXGesture extends GestureDetector.SimpleOnGestureListener implements OnTouchListener {
@@ -130,7 +130,7 @@ public class WXGesture extends GestureDetector.SimpleOnGestureListener implement
* shouldBubbleEvent default true
* */
private boolean shouldBubbleTouchEvent(MotionEvent event){
- if(component.containsEvent(SHOULD_STOP_PROPAGATION)){
+ if(component.containsEvent(STOP_PROPAGATION)){
if(shouldBubbleInterval > 0 && shouldBubbleCallRemainTimes > 0){
shouldBubbleCallRemainTimes--;
return shouldBubbleResult;
@@ -145,9 +145,10 @@ public class WXGesture extends GestureDetector.SimpleOnGestureListener implement
}else{
eventMap.put("action", MOVE);
}
- EventResult result = component.fireEventWait(SHOULD_STOP_PROPAGATION, eventMap);
+ EventResult result = component.fireEventWait(STOP_PROPAGATION, eventMap);
if(result.isSuccess() && result.getResult() != null){
- shouldBubbleResult = WXUtils.getBoolean(result.getResult(), shouldBubbleResult);
+ boolean stopPropagation = WXUtils.getBoolean(result.getResult(), !shouldBubbleResult);
+ shouldBubbleResult = !stopPropagation;
}
shouldBubbleCallRemainTimes = shouldBubbleInterval;
return shouldBubbleResult;
@@ -194,7 +195,7 @@ public class WXGesture extends GestureDetector.SimpleOnGestureListener implement
result |= handlePanMotionEvent(event);
break;
}
- if(component.containsEvent(SHOULD_STOP_PROPAGATION)){
+ if(component.containsEvent(STOP_PROPAGATION)){
ViewGroup parent = (ViewGroup) v.getParent();
boolean requestDisallowInterceptTouchEvent = false;
if(parent != null){
[2/3] incubator-weex git commit: [WEEX-228][android]
ShouldStopPropagation Use ShortName StopPropagation,
traverseUpdateTree consumers to correct
Posted by mi...@apache.org.
[WEEX-228][android] ShouldStopPropagation Use ShortName StopPropagation, traverseUpdateTree consumers to correct
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/97d8f09c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/97d8f09c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/97d8f09c
Branch: refs/heads/master
Commit: 97d8f09c8c8d6e0d75ef49859ef2bc24d8a53830
Parents: 1c429f2
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Wed Feb 28 21:32:05 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Wed Feb 28 21:32:05 2018 +0800
----------------------------------------------------------------------
android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/97d8f09c/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
index ec12163..397be0c 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -151,7 +151,7 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject
WXDomObject child;
for (int i = 0; i < count; ++i) {
child = getChild(i);
- child.traverseTree(consumers);
+ child.traverseUpdateTree(consumers);
}
}
[3/3] incubator-weex git commit: Merge remote-tracking branch
'upstream/pr1042' into apache-master
Posted by mi...@apache.org.
Merge remote-tracking branch 'upstream/pr1042' 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/a3a05f08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a3a05f08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a3a05f08
Branch: refs/heads/master
Commit: a3a05f089c37e6f984f14d9dcb7b23ade9288b8c
Parents: b948d68 97d8f09
Author: misakuo <mi...@apache.org>
Authored: Thu Mar 1 16:15:05 2018 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Mar 1 16:15:05 2018 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/common/Constants.java | 2 +-
.../src/main/java/com/taobao/weex/dom/WXDomObject.java | 2 +-
.../java/com/taobao/weex/ui/component/WXComponent.java | 2 +-
.../java/com/taobao/weex/ui/view/gesture/WXGesture.java | 11 ++++++-----
4 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a3a05f08/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
----------------------------------------------------------------------