You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/05/16 06:59:40 UTC
[3/3] incubator-weex git commit: Merge branch
'globalEvent-macaca-case' of github.com:acton393/incubator-weex into 0.13-dev
Merge branch 'globalEvent-macaca-case' of github.com:acton393/incubator-weex into 0.13-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b2672dc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b2672dc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b2672dc4
Branch: refs/heads/0.13-dev
Commit: b2672dc493429c585a01bc12942e1ae8aef2fa69
Parents: 6566fc2 391ce4c
Author: sospartan <so...@apache.org>
Authored: Tue May 16 14:59:18 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Tue May 16 14:59:18 2017 +0800
----------------------------------------------------------------------
.../weex/extend/module/WXEventModule.java | 18 ++++++
.../WeexDemo/extend/module/WXEventModule.m | 16 ++++++
test/pages/modules/globalEvent.vue | 48 ++++++++++++++++
test/scripts/modules/globalEvent.test.js | 60 ++++++++++++++++++++
4 files changed, 142 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b2672dc4/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
----------------------------------------------------------------------
diff --cc android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
index 10a51cd,06c5326..e417f0f
--- a/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXEventModule.java
@@@ -22,8 -22,8 +22,9 @@@ import android.content.Intent
import android.net.Uri;
import android.text.TextUtils;
+import com.alibaba.weex.WXPageActivity;
import com.taobao.weex.annotation.JSMethod;
+ import com.taobao.weex.bridge.JSCallback;
import com.taobao.weex.common.WXModule;
import java.util.HashMap;