You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ji...@apache.org on 2017/01/24 08:21:16 UTC
[05/50] [abbrv] incubator-weex git commit: V0.10.0 stable sync bugfix
(#133)
V0.10.0 stable sync bugfix (#133)
* * [android] bugfix Dom module sync callback
* * [android] remove space
* * [android] set dirty flag
* Update WXDomModule.java
* Update WXBridgeManager.java
* * [android] return when callback ==undefined or -1
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0c017703
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0c017703
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0c017703
Branch: refs/heads/master
Commit: 0c01770351df8edb1a10589ba396d137931a30e5
Parents: 80bcc0d
Author: zhengshihan <zh...@gmail.com>
Authored: Tue Jan 10 20:52:35 2017 +0800
Committer: sospartan zheng <so...@apache.org>
Committed: Tue Jan 10 20:52:35 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/bridge/WXBridgeManager.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0c017703/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 52f855f..be1bc51 100755
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -295,7 +295,9 @@ public class WXBridgeManager implements Callback,BactchExecutor {
public static final String MODULE = "module";
public static final String METHOD = "method";
public static final String ARGS = "args";
- private static final String UNDEFINED = "-1";
+ private static final String NON_CALLBACK = "-1";
+ private static final String UNDEFINED = "undefined";
+
private static final int INIT_FRAMEWORK_OK = 1;
private static long LOW_MEM_VALUE = 80;
@@ -579,7 +581,7 @@ public class WXBridgeManager implements Callback,BactchExecutor {
}
}
- if (UNDEFINED.equals(callback)) {
+ if (UNDEFINED.equals(callback) || NON_CALLBACK.equals(callback)) {
return IWXBridge.INSTANCE_RENDERING_ERROR;
}
// get next tick
@@ -612,7 +614,7 @@ public class WXBridgeManager implements Callback,BactchExecutor {
domModule.addElement(ref, domObject, Integer.parseInt(index));
}
- if (UNDEFINED.equals(callback)) {
+ if (UNDEFINED.equals(callback) || NON_CALLBACK.equals(callback)) {
return IWXBridge.INSTANCE_RENDERING_ERROR;
}
// get next tick