You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/04/13 11:21:02 UTC
[12/23] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.12-dev' into iOS-0.12-dev-text-refactor
Merge remote-tracking branch 'upstream/0.12-dev' into iOS-0.12-dev-text-refactor
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/60460c62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/60460c62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/60460c62
Branch: refs/heads/0.12-dev
Commit: 60460c62a69a0c329d96e4c94ff838df558cfbbe
Parents: a95a062 4c9e195
Author: acton393 <zh...@gmail.com>
Authored: Wed Apr 12 12:07:28 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Apr 12 12:07:28 2017 +0800
----------------------------------------------------------------------
DISCLAIMER | 1 +
LICENSE | 2 +-
.../java/com/taobao/weex/WXSDKInstance.java | 25 ++++
.../taobao/weex/dom/action/AnimationAction.java | 3 +-
.../taobao/weex/ui/component/WXComponent.java | 14 ++-
.../com/taobao/weex/utils/WXResourceUtils.java | 105 +++++++---------
.../taobao/weex/utils/WXResourceUtilsTest.java | 13 +-
doc/source/cn/references/modules/modal.md | 2 +
doc/source/references/modules/modal.md | 2 +
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 122 ++++++++++++++++++-
ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 6 +-
test/run.sh | 9 +-
test/scripts/components/recycler.test.js | 2 +-
13 files changed, 222 insertions(+), 84 deletions(-)
----------------------------------------------------------------------