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:12 UTC
[3/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/e7656e79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e7656e79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e7656e79
Branch: refs/heads/0.12-dev
Commit: e7656e791af8da09bb39c8f96af4e00daa6ad1d2
Parents: 9076095 d073636
Author: moxun.ljf <fu...@foxmail.com>
Authored: Mon Mar 27 19:46:10 2017 +0800
Committer: moxun.ljf <fu...@foxmail.com>
Committed: Mon Mar 27 19:46:10 2017 +0800
----------------------------------------------------------------------
.../app/src/main/assets/component/image-demo.js | 2 +-
.../assets/component/slider-neighbor/index.js | 264 ++
.../slider-neighbor/silder-neighbor.js | 287 --
.../src/main/assets/component/slider/index.js | 33 +
.../app/src/main/assets/component/text-demo.js | 108 +
.../app/src/main/assets/component/web-demo.js | 1 -
android/playground/app/src/main/assets/error.js | 2217 ++++++++++++
.../app/src/main/assets/geolocation.js | 183 +
.../app/src/main/assets/hello_weex.js | 28 -
android/playground/app/src/main/assets/index.js | 2 +-
.../app/src/main/assets/linear-gradient.js | 367 ++
.../app/src/main/assets/module/clipboard.js | 27 +-
.../app/src/main/assets/module/componentRect.js | 107 +-
.../app/src/main/assets/module/instance-api.js | 14 +-
.../app/src/main/assets/module/modal.js | 18 +-
.../app/src/main/assets/module/picker-demo.js | 18 +-
.../app/src/main/assets/module/storage-demo.js | 14 +-
.../app/src/main/assets/module/stream-demo.js | 18 +-
.../src/main/assets/module/websocket-demo.js | 2412 +++++++++++++
.../app/src/main/assets/showcase/calculator.js | 21 +-
.../assets/showcase/dropdown/dropdown-demo.js | 30 +-
.../assets/showcase/dropdown/we-dropdown.js | 12 +-
.../app/src/main/assets/showcase/minesweeper.js | 12 +-
.../main/assets/showcase/new-fashion/banner.js | 8 +-
.../main/assets/showcase/new-fashion/banners.js | 20 +-
.../main/assets/showcase/new-fashion/brand.js | 36 +-
.../assets/showcase/new-fashion/category.js | 24 +-
.../main/assets/showcase/new-fashion/coupon.js | 12 +-
.../main/assets/showcase/new-fashion/fashion.js | 38 +-
.../main/assets/showcase/new-fashion/goods.js | 24 +-
.../assets/showcase/new-fashion/headlines.js | 48 +-
.../main/assets/showcase/new-fashion/index.js | 21 +-
.../main/assets/showcase/new-fashion/link.js | 8 +-
.../main/assets/showcase/new-fashion/main.js | 209 +-
.../main/assets/showcase/new-fashion/match.js | 24 +-
.../assets/showcase/new-fashion/resource.js | 38 +-
.../main/assets/showcase/new-fashion/scene.js | 24 +-
.../src/main/assets/showcase/pseudo-class.js | 2425 +++++++++++++
.../app/src/main/assets/showcase/ui.js | 24 +-
.../app/src/main/assets/style/index.js | 76 +-
.../app/src/main/assets/style/style-box.js | 40 +-
.../app/src/main/assets/style/style-flex.js | 48 +-
.../app/src/main/assets/style/style-item.js | 12 +-
.../app/src/main/assets/syntax/hello-world-1.js | 4 +-
.../app/src/main/assets/syntax/hello-world-2.js | 6 +-
.../app/src/main/assets/syntax/hello-world-3.js | 10 +-
.../app/src/main/assets/syntax/hello-world-4.js | 14 +-
.../app/src/main/assets/syntax/hello-world-5.js | 14 +-
.../app/src/main/assets/syntax/hello-world.js | 14 +-
.../app/src/main/assets/syntax/index.js | 20 +-
.../src/main/assets/syntax/script-component.js | 24 +-
.../app/src/main/assets/syntax/script-data.js | 12 +-
.../app/src/main/assets/syntax/script-events.js | 12 +-
.../src/main/assets/syntax/script-instance.js | 12 +-
.../src/main/assets/syntax/script-lifecycle.js | 12 +-
.../app/src/main/assets/syntax/script-module.js | 12 +-
.../src/main/assets/syntax/script-options.js | 12 +-
.../src/main/assets/syntax/template-class.js | 12 +-
.../src/main/assets/syntax/template-content.js | 20 +-
.../src/main/assets/syntax/template-event.js | 12 +-
.../app/src/main/assets/syntax/template-if.js | 12 +-
.../assets/syntax/template-repeat-update.js | 12 +-
.../src/main/assets/syntax/template-repeat.js | 12 +-
.../src/main/assets/syntax/template-style.js | 8 +-
.../playground/app/src/main/assets/template.js | 12 +-
android/playground/app/src/main/assets/test.js | 128 +
.../app/src/main/assets/vue/animation.js | 709 ++++
.../app/src/main/assets/vue/components/a.js | 438 +++
.../src/main/assets/vue/components/countdown.js | 640 ++++
.../app/src/main/assets/vue/components/image.js | 641 ++++
.../app/src/main/assets/vue/components/input.js | 364 ++
.../app/src/main/assets/vue/components/list.js | 246 ++
.../src/main/assets/vue/components/marquee.js | 534 +++
.../src/main/assets/vue/components/navigator.js | 1059 ++++++
.../src/main/assets/vue/components/scroller.js | 304 ++
.../src/main/assets/vue/components/slider.js | 898 +++++
.../src/main/assets/vue/components/tabbar.js | 599 ++++
.../app/src/main/assets/vue/components/text.js | 513 +++
.../app/src/main/assets/vue/components/video.js | 396 +++
.../app/src/main/assets/vue/components/web.js | 459 +++
.../playground/app/src/main/assets/vue/hello.js | 99 +
.../app/src/main/assets/vue/iconfont.js | 204 ++
.../playground/app/src/main/assets/vue/index.js | 496 +++
.../src/main/assets/vue/modules/clipboard.js | 691 ++++
.../src/main/assets/vue/modules/instance-api.js | 304 ++
.../app/src/main/assets/vue/modules/modal.js | 581 +++
.../app/src/main/assets/vue/modules/storage.js | 381 ++
.../app/src/main/assets/vue/modules/stream.js | 477 +++
.../src/main/assets/vue/showcase/calculator.js | 340 ++
.../src/main/assets/vue/showcase/itemlist.js | 1062 ++++++
.../src/main/assets/vue/showcase/new-fashion.js | 3302 ++++++++++++++++++
.../src/main/assets/vue/showcase/progress.js | 336 ++
.../app/src/main/assets/vue/style/index.js | 1566 +++++++++
.../app/src/main/assets/vue/style/style-box.js | 780 +++++
.../app/src/main/assets/vue/style/style-flex.js | 919 +++++
.../app/src/main/assets/vue/style/style-item.js | 155 +
.../src/main/assets/vue/syntax/hello-world-1.js | 95 +
.../src/main/assets/vue/syntax/hello-world-2.js | 112 +
.../src/main/assets/vue/syntax/hello-world-3.js | 127 +
.../src/main/assets/vue/syntax/hello-world-4.js | 167 +
.../src/main/assets/vue/syntax/hello-world-5.js | 173 +
.../src/main/assets/vue/syntax/hello-world.js | 183 +
.../main/assets/vue/syntax/script-component.js | 224 ++
.../src/main/assets/vue/syntax/script-data.js | 214 ++
.../src/main/assets/vue/syntax/script-events.js | 161 +
.../main/assets/vue/syntax/script-instance.js | 196 ++
.../main/assets/vue/syntax/script-lifecycle.js | 155 +
.../src/main/assets/vue/syntax/script-module.js | 156 +
.../main/assets/vue/syntax/script-options.js | 182 +
.../main/assets/vue/syntax/template-class.js | 161 +
.../main/assets/vue/syntax/template-content.js | 189 +
.../main/assets/vue/syntax/template-event.js | 197 ++
.../src/main/assets/vue/syntax/template-if.js | 165 +
.../assets/vue/syntax/template-repeat-update.js | 195 ++
.../main/assets/vue/syntax/template-repeat.js | 170 +
.../main/assets/vue/syntax/template-style.js | 144 +
.../app/src/main/assets/vue/template.js | 796 +++++
.../playground/app/src/main/ic_launcher-web.png | Bin 0 -> 19935 bytes
.../java/com/alibaba/weex/WXApplication.java | 5 +
.../alibaba/weex/extend/component/WXMask.java | 167 +
.../extend/component/dom/WXMaskDomObject.java | 231 ++
.../alibaba/weex/extend/view/WXMaskView.java | 220 ++
.../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 5248 -> 1755 bytes
.../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 4303 -> 1221 bytes
.../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 6354 -> 2451 bytes
.../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7930 -> 3939 bytes
.../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 10633 -> 5608 bytes
examples/component/image-demo.we | 2 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 4 +
129 files changed, 33181 insertions(+), 863 deletions(-)
----------------------------------------------------------------------