You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/04/10 06:21:15 UTC
[6/9] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.12-dev' into 0.12-dev
Merge remote-tracking branch 'upstream/0.12-dev' into 0.12-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/c86d15e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c86d15e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c86d15e6
Branch: refs/heads/0.12-dev
Commit: c86d15e68a4d9da094b12631bc4ebfad82d1d267
Parents: 9fe32be c597a05
Author: moxun.ljf <fu...@foxmail.com>
Authored: Fri Apr 7 10:32:29 2017 +0800
Committer: moxun.ljf <fu...@foxmail.com>
Committed: Fri Apr 7 10:32:29 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 14 +--
.../java/com/taobao/weex/WXSDKInstance.java | 15 +--
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.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 | 9 +-
22 files changed, 253 insertions(+), 200 deletions(-)
----------------------------------------------------------------------