You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/08/24 10:35:54 UTC
[06/24] incubator-weex git commit: Merge branch '0.16-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into
ios-feature-accessibility
Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-accessibility
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/43855a8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/43855a8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/43855a8b
Branch: refs/heads/0.16-dev
Commit: 43855a8bbbd08d94a62ea49c8a44570ad0f51f2f
Parents: 5959413 cf40471
Author: acton393 <zh...@gmail.com>
Authored: Tue Aug 8 11:14:55 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Aug 8 11:14:55 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/43855a8b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------