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:13 UTC
[4/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
# Conflicts:
# examples/component/list/list-basic.we
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8f62317a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8f62317a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8f62317a
Branch: refs/heads/0.12-dev
Commit: 8f62317a2edb67f972f6e7cfb84a1ed9182b4b87
Parents: e7656e7 80df1aa
Author: moxun.ljf <fu...@foxmail.com>
Authored: Thu Mar 30 16:19:24 2017 +0800
Committer: moxun.ljf <fu...@foxmail.com>
Committed: Thu Mar 30 16:19:24 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/common/Constants.java | 2 +
.../taobao/weex/dom/WXRecyclerDomObject.java | 4 +-
.../taobao/weex/ui/component/WXComponent.java | 25 +
.../com/taobao/weex/ui/component/WXText.java | 8 +
.../com/taobao/weex/ui/view/WXTextView.java | 18 +-
build/webpack.deprecatedmacacatest.config.js | 6 +-
examples/accessibilitySupport.we | 57 +
examples/component/input-demo.we | 253 +-
examples/component/list/list-basic.we | 6 +-
examples/component/slider-tab.we | 100 +
examples/include/example-list-item.we | 30 +-
examples/index.we | 4 +-
examples/linear-gradient.we | 3 +
examples/module/chatroom-demo.we | 227 ++
examples/module/websocket-demo.we | 50 +-
examples/showcase/boxshadow.we | 46 +
examples/vue/components/input.vue | 203 +-
examples/vue/components/list.vue | 3 +
examples/vue/index.vue | 1 +
examples/vue/showcase/boxshadow.vue | 39 +
ios/playground/bundlejs/component/image-demo.js | 2 +-
ios/playground/bundlejs/component/input-demo.js | 2683 ++++--------------
.../bundlejs/component/lengthunitwx-demo.js | 329 +++
.../bundlejs/component/list/list-basic.js | 132 +-
.../component/list/list-demo-horizon.js | 12 +-
.../bundlejs/component/list/list-demo.js | 12 +-
.../bundlejs/component/list/waterfall.js | 877 ++++++
.../bundlejs/component/marquee-demo.js | 13 +-
.../bundlejs/component/process-bar-demo.js | 17 +-
.../bundlejs/component/scroller-demo.js | 219 +-
.../bundlejs/component/slider-neighbor/index.js | 8 +-
.../slider-neighbor/slider-neighbor-item.js | 12 +-
.../slider-neighbor/slider-neighbor-page.js | 28 +-
ios/playground/bundlejs/component/slider-tab.js | 633 +++++
.../bundlejs/component/slider/index.js | 56 +-
.../bundlejs/component/slider/slider-item.js | 12 +-
.../bundlejs/component/slider/slider-page.js | 28 +-
ios/playground/bundlejs/component/text-demo.js | 24 +-
ios/playground/bundlejs/component/video-demo.js | 24 +-
ios/playground/bundlejs/component/web-demo.js | 25 +-
ios/playground/bundlejs/error.js | 20 +-
ios/playground/bundlejs/geolocation.js | 46 +-
ios/playground/bundlejs/hello.js | 4 +-
ios/playground/bundlejs/iconfont.js | 12 +-
ios/playground/bundlejs/index.js | 270 +-
ios/playground/bundlejs/linear-gradient.js | 8 +-
ios/playground/bundlejs/module/chatroom-demo.js | 370 +++
ios/playground/bundlejs/module/clipboard.js | 61 +-
ios/playground/bundlejs/module/componentRect.js | 28 +-
ios/playground/bundlejs/module/instance-api.js | 61 +-
ios/playground/bundlejs/module/modal.js | 27 +-
ios/playground/bundlejs/module/picker-demo.js | 27 +-
ios/playground/bundlejs/module/storage-demo.js | 61 +-
ios/playground/bundlejs/module/stream-demo.js | 61 +-
.../bundlejs/module/websocket-demo.js | 2661 +++++++----------
ios/playground/bundlejs/showcase/boxshadow.js | 269 ++
ios/playground/bundlejs/showcase/calculator.js | 30 +-
.../bundlejs/showcase/dropdown/dropdown-demo.js | 38 +-
.../bundlejs/showcase/dropdown/we-dropdown.js | 12 +-
ios/playground/bundlejs/showcase/minesweeper.js | 12 +-
.../bundlejs/showcase/pseudo-class.js | 30 +-
ios/playground/bundlejs/showcase/ui.js | 30 +-
ios/playground/bundlejs/style/index.js | 82 +-
ios/playground/bundlejs/style/style-box.js | 46 +-
ios/playground/bundlejs/style/style-flex.js | 54 +-
ios/playground/bundlejs/style/style-item.js | 12 +-
ios/playground/bundlejs/syntax/hello-world-1.js | 4 +-
ios/playground/bundlejs/syntax/hello-world-2.js | 4 +-
ios/playground/bundlejs/syntax/hello-world-3.js | 8 +-
ios/playground/bundlejs/syntax/hello-world-4.js | 12 +-
ios/playground/bundlejs/syntax/hello-world-5.js | 12 +-
ios/playground/bundlejs/syntax/hello-world.js | 12 +-
ios/playground/bundlejs/syntax/index.js | 296 +-
.../bundlejs/syntax/script-component.js | 24 +-
ios/playground/bundlejs/syntax/script-data.js | 12 +-
ios/playground/bundlejs/syntax/script-events.js | 20 +-
.../bundlejs/syntax/script-instance.js | 12 +-
.../bundlejs/syntax/script-lifecycle.js | 12 +-
ios/playground/bundlejs/syntax/script-module.js | 12 +-
.../bundlejs/syntax/script-options.js | 12 +-
.../bundlejs/syntax/template-class.js | 12 +-
.../bundlejs/syntax/template-content.js | 20 +-
.../bundlejs/syntax/template-event.js | 12 +-
ios/playground/bundlejs/syntax/template-if.js | 12 +-
.../bundlejs/syntax/template-repeat-update.js | 12 +-
.../bundlejs/syntax/template-repeat.js | 12 +-
.../bundlejs/syntax/template-style.js | 8 +-
ios/playground/bundlejs/template.js | 12 +-
ios/playground/bundlejs/test.js | 8 +-
ios/playground/bundlejs/vue/animation.js | 120 +-
ios/playground/bundlejs/vue/components/a.js | 97 +-
.../bundlejs/vue/components/countdown.js | 122 +-
ios/playground/bundlejs/vue/components/image.js | 142 +-
ios/playground/bundlejs/vue/components/input.js | 735 +++--
ios/playground/bundlejs/vue/components/list.js | 44 +-
.../bundlejs/vue/components/marquee.js | 105 +-
.../bundlejs/vue/components/navigator.js | 187 +-
.../bundlejs/vue/components/scroller.js | 48 +-
.../bundlejs/vue/components/slider.js | 341 +--
.../bundlejs/vue/components/tabbar.js | 133 +-
ios/playground/bundlejs/vue/components/text.js | 132 +-
ios/playground/bundlejs/vue/components/video.js | 72 +-
.../bundlejs/vue/components/waterfall.js | 877 ++++++
ios/playground/bundlejs/vue/components/web.js | 74 +-
ios/playground/bundlejs/vue/hello.js | 19 +-
ios/playground/bundlejs/vue/iconfont.js | 36 +-
ios/playground/bundlejs/vue/index.js | 139 +-
.../bundlejs/vue/modules/clipboard.js | 147 +-
.../bundlejs/vue/modules/instance-api.js | 59 +-
ios/playground/bundlejs/vue/modules/modal.js | 105 +-
ios/playground/bundlejs/vue/modules/storage.js | 71 +-
ios/playground/bundlejs/vue/modules/stream.js | 95 +-
.../bundlejs/vue/showcase/boxshadow.js | 244 ++
.../bundlejs/vue/showcase/calculator.js | 72 +-
.../bundlejs/vue/showcase/itemlist.js | 166 +-
.../bundlejs/vue/showcase/new-fashion.js | 557 ++--
.../bundlejs/vue/showcase/progress.js | 63 +-
ios/playground/bundlejs/vue/style/index.js | 418 +--
ios/playground/bundlejs/vue/style/style-box.js | 180 +-
ios/playground/bundlejs/vue/style/style-flex.js | 238 +-
ios/playground/bundlejs/vue/style/style-item.js | 26 +-
.../bundlejs/vue/syntax/hello-world-1.js | 17 +-
.../bundlejs/vue/syntax/hello-world-2.js | 23 +-
.../bundlejs/vue/syntax/hello-world-3.js | 28 +-
.../bundlejs/vue/syntax/hello-world-4.js | 32 +-
.../bundlejs/vue/syntax/hello-world-5.js | 32 +-
.../bundlejs/vue/syntax/hello-world.js | 32 +-
.../bundlejs/vue/syntax/script-component.js | 64 +-
.../bundlejs/vue/syntax/script-data.js | 36 +-
.../bundlejs/vue/syntax/script-events.js | 32 +-
.../bundlejs/vue/syntax/script-instance.js | 30 +-
.../bundlejs/vue/syntax/script-lifecycle.js | 32 +-
.../bundlejs/vue/syntax/script-module.js | 30 +-
.../bundlejs/vue/syntax/script-options.js | 28 +-
.../bundlejs/vue/syntax/template-class.js | 34 +-
.../bundlejs/vue/syntax/template-content.js | 49 +-
.../bundlejs/vue/syntax/template-event.js | 36 +-
.../bundlejs/vue/syntax/template-if.js | 32 +-
.../vue/syntax/template-repeat-update.js | 40 +-
.../bundlejs/vue/syntax/template-repeat.js | 50 +-
.../bundlejs/vue/syntax/template-style.js | 27 +-
ios/playground/bundlejs/vue/template.js | 181 +-
.../Component/Recycler/WXMultiColumnLayout.h | 2 +
.../Component/Recycler/WXMultiColumnLayout.m | 5 +-
.../Component/Recycler/WXRecyclerComponent.m | 45 +-
.../Recycler/WXRecyclerDataController.h | 4 +
.../Recycler/WXRecyclerDataController.m | 18 +
.../Component/WXComponent+GradientColor.m | 56 +-
.../Sources/Component/WXComponent_internal.h | 9 +
.../WeexSDK/Sources/Component/WXListComponent.m | 7 +-
.../Sources/Component/WXScrollerComponent.m | 10 +-
.../WeexSDK/Sources/Component/WXTextComponent.m | 5 +
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 29 +
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.m | 40 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 1 +
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 22 +
test/pages/components/recycler.vue | 487 ++++
test/scripts/components/recycler.test.js | 412 +++
159 files changed, 11814 insertions(+), 7192 deletions(-)
----------------------------------------------------------------------