Merge remote-tracking branch 'upstream/0.11-dev' 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/80ddeae8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/80ddeae8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/80ddeae8 Branch: refs/heads/0.11-dev Commit: 80ddeae8c657e4c47477dbd6abda182d40631548 Parents: d59aac4 8f3167d Author: éé£ <[email protected]> Authored: Thu Mar 16 16:14:48 2017 +0800 Committer: éé£ <[email protected]> Committed: Thu Mar 16 16:14:48 2017 +0800 ---------------------------------------------------------------------- android/sdk/assets/main.js | 14 +++--- .../com/taobao/weex/bridge/WXBridgeManager.java | 22 ++++++---- .../taobao/weex/bridge/WXValidateProcessor.java | 15 ++++++- .../java/com/taobao/weex/dom/WXDomObject.java | 4 ++ 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 +++++-- .../Sources/Manager/WXComponentManager.m | 1 + .../WeexSDK/Sources/Module/WXAnimationModule.m | 5 +++ ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +- package.json | 2 +- 12 files changed, 109 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
