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/17 07:11:44 UTC
[40/40] incubator-weex git commit: Merge branch '0.11-dev' into
0.12-dev
Merge branch '0.11-dev' into 0.12-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/86b8a500
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/86b8a500
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/86b8a500
Branch: refs/heads/0.12-dev
Commit: 86b8a50039b3388b08c646da94c2f89bf2302b87
Parents: d2399f1 c6c6399
Author: sospartan <so...@apache.org>
Authored: Fri Mar 17 15:10:45 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Fri Mar 17 15:10:45 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 14 +++---
android/sdk/libs/armeabi/libweexv8.so | Bin 3583820 -> 3583820 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4340864 -> 4336768 bytes
.../com/taobao/weex/bridge/WXBridgeManager.java | 32 ++++++-------
.../taobao/weex/bridge/WXValidateProcessor.java | 15 ++++++-
.../java/com/taobao/weex/dom/WXDomObject.java | 4 ++
examples/vue/components/waterfall.vue | 9 ++++
html5/shared/freeze.js | 45 ++++++++++++++++++-
html5/test/unit/shared/index.js | 2 +-
ios/sdk/WeexSDK/Resources/main.js | 14 +++---
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 15 +++++--
.../Component/Recycler/WXMultiColumnLayout.m | 5 ++-
.../Component/Recycler/WXRecyclerComponent.m | 4 +-
.../Recycler/WXRecyclerUpdateController.m | 9 ++--
.../Component/WXComponent+GradientColor.m | 3 ++
.../Sources/Component/WXScrollerComponent.m | 6 +--
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 4 ++
.../Sources/Manager/WXComponentManager.m | 1 +
.../WeexSDK/Sources/Module/WXAnimationModule.m | 40 ++++++++++++++---
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +-
package.json | 2 +-
21 files changed, 170 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/86b8a500/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/86b8a500/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
----------------------------------------------------------------------