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/03/14 08:15:06 UTC
[3/7] incubator-weex git commit: Merge branch '0.11-dev' of
http://gitlab.alibaba-inc.com/weex/weex into 0.11-dev
Merge branch '0.11-dev' of http://gitlab.alibaba-inc.com/weex/weex into 0.11-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/f759a8ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f759a8ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f759a8ce
Branch: refs/heads/0.11-dev
Commit: f759a8cea6b9c0f3a66cfb5b2be4cd8eebe6f72f
Parents: f7977e3 d876e67
Author: zshshr <zh...@gmail.com>
Authored: Tue Mar 14 11:48:26 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Tue Mar 14 11:48:26 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 14 +++++++-------
.../src/main/java/com/taobao/weex/WXSDKInstance.java | 4 ++++
.../weex/ui/component/AbstractEditComponent.java | 6 ++++++
.../com/taobao/weex/ui/component/WXComponent.java | 12 +++++++++++-
.../taobao/weex/ui/component/pesudo/PesudoStatus.java | 2 +-
.../main/java/com/taobao/weex/utils/WXViewUtils.java | 2 +-
ios/sdk/WeexSDK/Resources/main.js | 14 +++++++-------
7 files changed, 37 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f759a8ce/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------