Merge remote-tracking branch 'upstream/0.12-dev' into ios-feature-composite
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/29a47f87 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/29a47f87 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/29a47f87 Branch: refs/heads/0.12-dev Commit: 29a47f87f1b3c7522bf7ce4bdfdddcb2af320813 Parents: e3ee82f 6e4dcfb Author: éé£ <cxf...@apache.org> Authored: Sun Apr 9 19:54:53 2017 +0800 Committer: éé£ <cxf...@apache.org> Committed: Sun Apr 9 19:54:53 2017 +0800 ---------------------------------------------------------------------- android/sdk/assets/main.js | 14 ++-- .../java/com/taobao/weex/WXSDKInstance.java | 15 ++-- .../com/taobao/weex/ui/component/WXSlider.java | 81 ++++++++++++++++++-- .../taobao/weex/ui/view/WXCircleViewPager.java | 21 +++-- build/config.js | 8 +- build/karma.vue.conf.js | 15 ++-- build/webpack.examples.config.js | 4 +- doc/source/cn/references/modules/dom.md | 3 +- doc/source/references/modules/dom.md | 3 +- examples/module/componentRect.we | 4 +- html5/frameworks/legacy/app/ctrl/init.js | 42 ++++++++-- html5/frameworks/legacy/static/life.js | 8 +- ios/sdk/WeexSDK/Resources/main.js | 14 ++-- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 4 + ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 77 +++++++++++++++++++ .../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 5 ++ package.json | 9 ++- test/pages/slider-infinite.vue | 49 ++++++++++++ test/scripts/components/slider-infinite.test.js | 38 +++++++++ 19 files changed, 357 insertions(+), 57 deletions(-) ----------------------------------------------------------------------