Repository: incubator-weex Updated Branches: refs/heads/0.16-dev a0581f009 -> 77fff9fa5
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-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/eeff0201 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eeff0201 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eeff0201 Branch: refs/heads/0.16-dev Commit: eeff0201e43145cf1b03b08620a82ac2feab8d1c Parents: adaf9cf cf40471 Author: misakuo <misa...@apache.org> Authored: Mon Aug 7 09:47:23 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Mon Aug 7 09:47:23 2017 +0800 ---------------------------------------------------------------------- .../java/com/alibaba/weex/IndexActivity.java | 14 ++ .../main/java/com/taobao/weex/WXSDKManager.java | 10 ++ .../taobao/weex/common/WXWorkThreadManager.java | 48 ++++++ .../com/taobao/weex/ui/component/WXImage.java | 68 +++++++++ .../taobao/weex/utils/WXViewToImageUtil.java | 151 +++++++++++++++++++ build/karma.vue.conf.js | 2 +- examples/vue/components/scroller.vue | 9 +- examples/vue/modules/picker.vue | 149 +++++++----------- .../vue/components/scrollable/scroller.js | 8 +- .../render/vue/components/scrollable/style.css | 5 + html5/render/vue/modules/dom.js | 97 ++++++------ html5/test/render/vue/modules/dom.js | 17 ++- ios/playground/Podfile | 2 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 +- .../WeexSDK/Sources/Component/WXAComponent.m | 1 + .../WeexSDK/Sources/Component/WXEditComponent.m | 11 +- .../Sources/Component/WXImageComponent.m | 30 ++-- .../Sources/Component/WXTextAreaComponent.m | 2 +- ios/sdk/WeexSDK/Sources/Component/WXTransform.h | 1 + ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 33 ++-- .../Sources/Component/WXVideoComponent.m | 1 + .../WeexSDK/Sources/Component/WXWebComponent.m | 1 + ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 1 + ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 1 + .../WeexSDK/Sources/Module/WXAnimationModule.m | 5 + ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 1 + .../Sources/Network/WXResourceResponse.h | 2 +- .../Sources/Protocol/WXURLRewriteProtocol.h | 2 +- ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 + package.json | 1 + test/pages/components/hyperlink_target.vue | 1 + vue.html | 3 + 32 files changed, 506 insertions(+), 177 deletions(-) ----------------------------------------------------------------------