You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/04/12 06:35:09 UTC
[06/12] incubator-weex git commit: Merge remote-tracking branch
'origin/0.12-dev' into feature-android-vdom-properties
Merge remote-tracking branch 'origin/0.12-dev' into feature-android-vdom-properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9fe977c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9fe977c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9fe977c1
Branch: refs/heads/0.12-dev
Commit: 9fe977c166525b1f08607ac6edba57f5b43c200a
Parents: 5595415 41c8ef6
Author: \u884c\u4e45 <yi...@alibaba-inc.com>
Authored: Thu Apr 6 15:47:37 2017 +0800
Committer: \u884c\u4e45 <yi...@alibaba-inc.com>
Committed: Thu Apr 6 15:47:37 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 14 +--
.../java/com/taobao/weex/WXSDKInstance.java | 5 +-
build/config.js | 8 +-
build/karma.vue.conf.js | 15 ++-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 8 --
ios/sdk/WeexSDK/Resources/main.js | 14 +--
.../Component/WXComponent+GradientColor.h | 18 ---
.../Component/WXComponent+GradientColor.m | 124 -------------------
.../Sources/Component/WXComponent_internal.h | 3 +
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 1 -
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 29 ++++-
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.m | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 27 ++++
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 101 +++++++++++++++
.../Sources/View/WXComponent+ViewManagement.m | 1 -
package.json | 7 +-
16 files changed, 195 insertions(+), 182 deletions(-)
----------------------------------------------------------------------