Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-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/8f3167d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8f3167d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8f3167d8 Branch: refs/heads/0.11-dev Commit: 8f3167d89f7de635d247b5f7da800a399107611d Parents: cbfab65 d9907e9 Author: MrRaindrop <[email protected]> Authored: Thu Mar 16 13:19:28 2017 +0800 Committer: MrRaindrop <[email protected]> Committed: Thu Mar 16 13:19:28 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 4 +- Dangerfile | 83 ------------- .../java/com/alibaba/weex/WXPageActivity.java | 2 +- .../extend/module/location/DefaultLocation.java | 110 +++++++++-------- .../com/taobao/weex/bridge/WXBridgeManager.java | 22 ++-- .../taobao/weex/bridge/WXValidateProcessor.java | 15 ++- .../com/taobao/weex/common/WXImageStrategy.java | 2 +- .../java/com/taobao/weex/dom/WXDomObject.java | 4 + .../main/java/com/taobao/weex/dom/WXStyle.java | 25 +--- .../taobao/weex/ui/component/WXComponent.java | 5 +- .../com/taobao/weex/ui/component/WXImage.java | 61 +++++++++- .../adapter/WXRecyclerViewOnScrollListener.java | 28 +++-- .../test/java/com/taobao/weex/TestActivity.java | 4 +- .../java/com/taobao/weex/dom/WXStyleTest.java | 23 +--- .../taobao/weex/utils/FunctionParserTest.java | 11 +- dangerfile.js | 117 +++++++++++++++++++ examples/vue/components/waterfall.vue | 9 ++ ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 15 ++- .../Component/Recycler/WXMultiColumnLayout.m | 5 +- .../Component/Recycler/WXRecyclerComponent.m | 4 +- .../WeexSDK/Sources/Component/WXListComponent.m | 5 + .../Sources/Component/WXScrollerComponent.m | 7 ++ .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 2 + .../Sources/Manager/WXComponentManager.m | 1 + .../WeexSDK/Sources/Module/WXAnimationModule.m | 5 + ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +- package.json | 8 +- test/ci-funcs.sh | 4 +- 28 files changed, 360 insertions(+), 223 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8f3167d8/package.json ----------------------------------------------------------------------
