You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/04/11 06:38:41 UTC
[10/18] 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/5bf791a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5bf791a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5bf791a0
Branch: refs/heads/0.12-dev
Commit: 5bf791a0e2a4bfff7e1882f5e37b0629806a3658
Parents: 9dd78d4 d240048
Author: acton393 <zh...@gmail.com>
Authored: Wed Apr 5 14:55:23 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Apr 5 14:55:23 2017 +0800
----------------------------------------------------------------------
.eslintrc | 3 +-
.../java/com/taobao/weex/WXSDKInstance.java | 12 +-
.../taobao/weex/ui/component/WXComponent.java | 7 +-
.../com/taobao/weex/ui/component/WXImage.java | 6 +
build/karma.vue.conf.js | 64 ++++++--
dangerfile.js | 6 +-
html5/render/vue/components/a.js | 3 +-
html5/render/vue/components/div.js | 10 +-
html5/render/vue/components/image.js | 2 +-
html5/render/vue/mixins/base.js | 7 +
html5/test/render/index.js | 3 -
html5/test/render/vue/components/a.js | 38 +++++
html5/test/render/vue/components/div.js | 29 ++++
html5/test/render/vue/components/image.js | 44 +++---
html5/test/render/vue/components/list.js | 21 ++-
html5/test/render/vue/components/switch.js | 35 +++--
html5/test/render/vue/components/text.js | 42 ++---
html5/test/render/vue/components/web.js | 14 +-
html5/test/render/vue/examples/list-cell.js | 16 +-
html5/test/render/vue/helper.js | 157 ++++++++++++++++---
html5/test/render/vue/utils.js | 1 -
html5/test/render/vue/validator/check.js | 1 -
html5/test/render/vue/validator/index.js | 1 -
html5/test/render/vue/validator/prop.js | 1 -
html5/test/render/vue/validator/style.js | 1 -
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 8 -
.../Component/WXComponent+GradientColor.h | 18 ---
.../Component/WXComponent+GradientColor.m | 124 ---------------
.../Sources/Component/WXComponent_internal.h | 3 +
.../Sources/Display/WXComponent+BoxShadow.h | 2 +-
.../Sources/Display/WXComponent+BoxShadow.m | 10 +-
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.h | 2 +-
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.m | 4 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 3 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 29 +++-
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.m | 25 +--
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 27 ++++
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 101 ++++++++++++
.../Sources/View/WXComponent+ViewManagement.m | 1 -
package.json | 4 +-
test/ci-funcs.sh | 3 +-
42 files changed, 545 insertions(+), 345 deletions(-)
----------------------------------------------------------------------