Merge branch '0.16-dev' into 0.16-dev-web
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7597456e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7597456e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7597456e Branch: refs/heads/0.16-dev Commit: 7597456e544a5c33024865b648de36ad0ed2208b Parents: 22f65ee cf40471 Author: MrRaindrop <tekk...@gmail.com> Authored: Fri Aug 4 15:44:51 2017 +0800 Committer: MrRaindrop <tekk...@gmail.com> Committed: Fri Aug 4 15:44:51 2017 +0800 ---------------------------------------------------------------------- .../java/com/alibaba/weex/IndexActivity.java | 14 ++ .../java/com/taobao/weex/WXSDKInstance.java | 11 +- .../main/java/com/taobao/weex/WXSDKManager.java | 10 ++ .../taobao/weex/common/WXWorkThreadManager.java | 48 ++++++ .../com/taobao/weex/ui/component/WXImage.java | 68 +++++++++ .../ui/component/list/BasicListComponent.java | 15 +- .../taobao/weex/utils/WXViewToImageUtil.java | 151 +++++++++++++++++++ build/karma.vue.conf.js | 2 +- dangerfile.js | 46 ++++-- examples/vue/components/scroller.vue | 9 +- examples/vue/index.vue | 1 + examples/vue/modules/picker.vue | 64 ++++++++ .../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/playground/WeexDemo/Info.plist | 4 + ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 8 +- .../WeexSDK/Sources/Component/WXAComponent.m | 1 + .../WeexSDK/Sources/Component/WXEditComponent.m | 11 +- .../Sources/Component/WXImageComponent.m | 119 ++++++++++++--- .../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 + .../WeexSDK/Sources/Module/WXWebSocketModule.h | 1 - .../WeexSDK/Sources/Module/WXWebSocketModule.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 + test/pages/image-onload.vue | 14 +- test/scripts/components/image-onload.test.js | 10 ++ vue.html | 3 + 41 files changed, 677 insertions(+), 117 deletions(-) ----------------------------------------------------------------------
