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/03/30 11:39:01 UTC
[27/30] incubator-weex git commit: Merge branch '0.11-dev' into
android-feature-20170307
Merge branch '0.11-dev' into android-feature-20170307
# Conflicts:
# android/playground/app/src/main/assets/error.js
# android/playground/app/src/main/assets/geolocation.js
# android/playground/app/src/main/assets/index.js
# android/playground/app/src/main/assets/module/componentRect.js
# android/playground/app/src/main/assets/module/instance-api.js
# android/playground/app/src/main/assets/module/modal.js
# android/playground/app/src/main/assets/module/picker-demo.js
# android/playground/app/src/main/assets/module/storage-demo.js
# android/playground/app/src/main/assets/module/stream-demo.js
# android/playground/app/src/main/assets/module/websocket-demo.js
# android/playground/app/src/main/assets/showcase/calculator.js
# android/playground/app/src/main/assets/showcase/dropdown/dropdown-demo.js
# android/playground/app/src/main/assets/showcase/dropdown/we-dropdown.js
# android/playground/app/src/main/assets/showcase/minesweeper.js
# android/playground/app/src/main/assets/showcase/new-fashion/banner.js
# android/playground/app/src/main/assets/showcase/new-fashion/banners.js
# android/playground/app/src/main/assets/showcase/new-fashion/brand.js
# android/playground/app/src/main/assets/showcase/new-fashion/category.js
# android/playground/app/src/main/assets/showcase/new-fashion/coupon.js
# android/playground/app/src/main/assets/showcase/new-fashion/fashion.js
# android/playground/app/src/main/assets/showcase/new-fashion/goods.js
# android/playground/app/src/main/assets/showcase/new-fashion/headlines.js
# android/playground/app/src/main/assets/showcase/new-fashion/index.js
# android/playground/app/src/main/assets/showcase/new-fashion/link.js
# android/playground/app/src/main/assets/showcase/new-fashion/main.js
# android/playground/app/src/main/assets/showcase/new-fashion/match.js
# android/playground/app/src/main/assets/showcase/new-fashion/resource.js
# android/playground/app/src/main/assets/showcase/new-fashion/scene.js
# android/playground/app/src/main/assets/showcase/ui.js
# android/playground/app/src/main/assets/style/index.js
# android/playground/app/src/main/assets/style/style-box.js
# android/playground/app/src/main/assets/style/style-flex.js
# android/playground/app/src/main/assets/style/style-item.js
# android/playground/app/src/main/assets/syntax/hello-world-1.js
# android/playground/app/src/main/assets/syntax/hello-world-2.js
# android/playground/app/src/main/assets/syntax/hello-world-3.js
# android/playground/app/src/main/assets/syntax/hello-world-4.js
# android/playground/app/src/main/assets/syntax/hello-world-5.js
# android/playground/app/src/main/assets/syntax/hello-world.js
# android/playground/app/src/main/assets/syntax/index.js
# android/playground/app/src/main/assets/syntax/script-component.js
# android/playground/app/src/main/assets/syntax/script-data.js
# android/playground/app/src/main/assets/syntax/script-events.js
# android/playground/app/src/main/assets/syntax/script-instance.js
# android/playground/app/src/main/assets/syntax/script-lifecycle.js
# android/playground/app/src/main/assets/syntax/script-module.js
# android/playground/app/src/main/assets/syntax/script-options.js
# android/playground/app/src/main/assets/syntax/template-class.js
# android/playground/app/src/main/assets/syntax/template-content.js
# android/playground/app/src/main/assets/syntax/template-event.js
# android/playground/app/src/main/assets/syntax/template-if.js
# android/playground/app/src/main/assets/syntax/template-repeat-update.js
# android/playground/app/src/main/assets/syntax/template-repeat.js
# android/playground/app/src/main/assets/syntax/template-style.js
# android/playground/app/src/main/assets/template.js
# android/playground/app/src/main/assets/test.js
# android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
# android/sdk/assets/main.js
# android/sdk/libs/armeabi/libweexv8.so
# android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
# package.json
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3e6f1c95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3e6f1c95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3e6f1c95
Branch: refs/heads/0.12-dev
Commit: 3e6f1c9518720d45f1f61ab67714b77e1b247efb
Parents: f8e8f58 cae9aa8
Author: zshshr <zh...@gmail.com>
Authored: Thu Mar 30 12:04:20 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Thu Mar 30 12:04:20 2017 +0800
----------------------------------------------------------------------
.travis.yml | 4 +-
CONTRIBUTING.md | 38 +-
Dangerfile | 55 -
Dangerfile-ios | 4 +
.../app/src/main/assets/component/image-demo.js | 2 +-
.../assets/component/slider-neighbor/index.js | 113 +-
.../slider-neighbor/silder-neighbor.js | 287 --
.../app/src/main/assets/component/text-demo.js | 108 +
android/playground/app/src/main/assets/error.js | 11 +-
.../app/src/main/assets/geolocation.js | 8 -
android/playground/app/src/main/assets/index.js | 17 +-
.../app/src/main/assets/linear-gradient.js | 367 ++
.../app/src/main/assets/module/clipboard.js | 10 +-
.../app/src/main/assets/module/componentRect.js | 36 +-
.../app/src/main/assets/module/instance-api.js | 21 +-
.../app/src/main/assets/module/modal.js | 25 +-
.../app/src/main/assets/module/picker-demo.js | 25 +-
.../app/src/main/assets/module/storage-demo.js | 21 +-
.../app/src/main/assets/module/stream-demo.js | 21 +-
.../src/main/assets/module/websocket-demo.js | 25 +-
.../app/src/main/assets/showcase/calculator.js | 25 +-
.../assets/showcase/dropdown/dropdown-demo.js | 38 +-
.../assets/showcase/dropdown/we-dropdown.js | 20 +-
.../app/src/main/assets/showcase/minesweeper.js | 20 +-
.../main/assets/showcase/new-fashion/banner.js | 16 +-
.../main/assets/showcase/new-fashion/banners.js | 28 +-
.../main/assets/showcase/new-fashion/brand.js | 44 +-
.../assets/showcase/new-fashion/category.js | 32 +-
.../main/assets/showcase/new-fashion/coupon.js | 20 +-
.../main/assets/showcase/new-fashion/fashion.js | 46 +-
.../main/assets/showcase/new-fashion/goods.js | 32 +-
.../assets/showcase/new-fashion/headlines.js | 56 +-
.../main/assets/showcase/new-fashion/index.js | 29 +-
.../main/assets/showcase/new-fashion/link.js | 16 +-
.../main/assets/showcase/new-fashion/main.js | 209 +-
.../main/assets/showcase/new-fashion/match.js | 32 +-
.../assets/showcase/new-fashion/resource.js | 46 +-
.../main/assets/showcase/new-fashion/scene.js | 32 +-
.../src/main/assets/showcase/pseudo-class.js | 2425 +++++++++++++
.../app/src/main/assets/showcase/ui.js | 28 +-
.../app/src/main/assets/style/index.js | 80 +-
.../app/src/main/assets/style/style-box.js | 44 +-
.../app/src/main/assets/style/style-flex.js | 52 +-
.../app/src/main/assets/style/style-item.js | 20 +-
.../app/src/main/assets/syntax/hello-world-1.js | 12 +-
.../app/src/main/assets/syntax/hello-world-2.js | 12 +-
.../app/src/main/assets/syntax/hello-world-3.js | 16 +-
.../app/src/main/assets/syntax/hello-world-4.js | 20 +-
.../app/src/main/assets/syntax/hello-world-5.js | 20 +-
.../app/src/main/assets/syntax/hello-world.js | 20 +-
.../app/src/main/assets/syntax/index.js | 28 +-
.../src/main/assets/syntax/script-component.js | 32 +-
.../app/src/main/assets/syntax/script-data.js | 20 +-
.../app/src/main/assets/syntax/script-events.js | 20 +-
.../src/main/assets/syntax/script-instance.js | 20 +-
.../src/main/assets/syntax/script-lifecycle.js | 20 +-
.../app/src/main/assets/syntax/script-module.js | 20 +-
.../src/main/assets/syntax/script-options.js | 20 +-
.../src/main/assets/syntax/template-class.js | 20 +-
.../src/main/assets/syntax/template-content.js | 28 +-
.../src/main/assets/syntax/template-event.js | 20 +-
.../app/src/main/assets/syntax/template-if.js | 20 +-
.../assets/syntax/template-repeat-update.js | 20 +-
.../src/main/assets/syntax/template-repeat.js | 20 +-
.../src/main/assets/syntax/template-style.js | 16 +-
.../playground/app/src/main/assets/template.js | 23 +-
android/playground/app/src/main/assets/test.js | 16 +-
.../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 +
.../java/com/alibaba/weex/WXPageActivity.java | 39 +-
.../alibaba/weex/extend/component/WXMask.java | 167 +
.../extend/component/dom/WXMaskDomObject.java | 231 ++
.../extend/module/location/DefaultLocation.java | 110 +-
.../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
android/sdk/assets/main.js | 14 +-
android/sdk/build.gradle | 21 +-
android/sdk/libs/x86/libweexv8.so | Bin 4340864 -> 4336768 bytes
.../java/com/taobao/weex/WXSDKInstance.java | 54 +-
.../main/java/com/taobao/weex/WXSDKManager.java | 2 +-
.../com/taobao/weex/bridge/WXBridgeManager.java | 85 +-
.../taobao/weex/bridge/WXValidateProcessor.java | 15 +-
.../java/com/taobao/weex/common/Constants.java | 1 +
.../com/taobao/weex/common/WXImageStrategy.java | 2 +-
.../java/com/taobao/weex/common/WXThread.java | 9 +
.../java/com/taobao/weex/dom/WXDomModule.java | 2 +-
.../java/com/taobao/weex/dom/WXDomObject.java | 6 +-
.../com/taobao/weex/dom/WXDomStatement.java | 4 +-
.../taobao/weex/dom/WXRecyclerDomObject.java | 4 +-
.../main/java/com/taobao/weex/dom/WXStyle.java | 65 +-
.../com/taobao/weex/ui/WXRenderStatement.java | 12 +-
.../weex/ui/animation/WXAnimationModule.java | 16 +-
.../ui/component/AbstractEditComponent.java | 10 +-
.../taobao/weex/ui/component/WXBaseRefresh.java | 10 -
.../taobao/weex/ui/component/WXComponent.java | 67 +-
.../com/taobao/weex/ui/component/WXEmbed.java | 4 +-
.../com/taobao/weex/ui/component/WXHeader.java | 5 +
.../com/taobao/weex/ui/component/WXImage.java | 61 +-
.../taobao/weex/ui/component/WXIndicator.java | 2 +-
.../com/taobao/weex/ui/component/WXLoading.java | 5 +
.../com/taobao/weex/ui/component/WXRefresh.java | 5 +
.../taobao/weex/ui/component/WXScroller.java | 16 +-
.../weex/ui/component/WXSliderNeighbor.java | 7 +-
.../taobao/weex/ui/component/WXVContainer.java | 3 +-
.../ui/component/list/BasicListComponent.java | 52 +-
.../ui/component/list/ListComponentView.java | 1 +
.../ui/component/list/SimpleRecyclerView.java | 77 +-
.../ui/component/list/StickyHeaderHelper.java | 337 ++
.../taobao/weex/ui/component/list/WXCell.java | 11 +
.../weex/ui/component/pesudo/PesudoStatus.java | 2 +-
.../com/taobao/weex/ui/module/WXMetaModule.java | 7 +-
.../weex/ui/view/border/BorderDrawable.java | 4 +-
.../taobao/weex/ui/view/gesture/WXGesture.java | 8 +-
.../adapter/WXRecyclerViewOnScrollListener.java | 28 +-
.../refresh/wrapper/BounceRecyclerView.java | 112 +-
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 11 +-
.../java/com/taobao/weex/utils/WXViewUtils.java | 14 +-
.../test/java/com/taobao/weex/TestActivity.java | 6 +-
.../java/com/taobao/weex/dom/WXStyleTest.java | 23 +-
.../taobao/weex/ui/module/WXMetaModuleTest.java | 10 +-
.../taobao/weex/utils/FunctionParserTest.java | 11 +-
build/webpack.macacatest.config.js | 6 +-
dangerfile.js | 117 +
doc/_config.yml | 9 +-
doc/advanced/extend-to-android.md | 2 +-
doc/package.json | 2 +-
doc/source/cn/faq.md | 6 +-
doc/source/cn/guide/contributing.md | 106 +
doc/source/cn/guide/dev-with-weexpack.md | 11 -
doc/source/cn/guide/index.md | 123 +-
doc/source/cn/guide/integrate-to-your-app.md | 6 +-
doc/source/cn/guide/intro/devtools.md | 99 -
doc/source/cn/guide/intro/index.md | 2 +-
doc/source/cn/guide/intro/using-vue.md | 2 +-
doc/source/cn/guide/intro/write-once.md | 2 +-
doc/source/cn/guide/set-up-env.md | 128 +
doc/source/cn/guide/tools/devtools.md | 111 +
doc/source/cn/guide/tools/index.md | 11 +
doc/source/cn/guide/tools/weexpack.md | 388 ++
.../cn/references/advanced/extend-jsfm.md | 2 +-
.../cn/references/advanced/extend-to-android.md | 22 +-
.../cn/references/advanced/extend-to-html5.md | 2 +-
.../cn/references/advanced/extend-to-ios.md | 233 +-
doc/source/cn/references/advanced/index.md | 2 +-
.../advanced/integrate-devtool-to-android.md | 6 +-
.../advanced/integrate-devtool-to-ios.md | 8 +-
doc/source/cn/references/android-apis.md | 25 +-
doc/source/cn/references/common-style.md | 10 +-
doc/source/cn/references/components/a.md | 25 +-
doc/source/cn/references/components/cell.md | 7 +-
doc/source/cn/references/components/div.md | 12 +-
doc/source/cn/references/components/image.md | 18 +-
.../cn/references/components/indicator.md | 3 +-
doc/source/cn/references/components/input.md | 2 +-
doc/source/cn/references/components/list.md | 6 +-
doc/source/cn/references/components/loading.md | 2 +
doc/source/cn/references/components/refresh.md | 4 +-
doc/source/cn/references/components/scroller.md | 6 +-
doc/source/cn/references/components/slider.md | 2 +-
doc/source/cn/references/components/switch.md | 2 +-
doc/source/cn/references/components/text.md | 2 +-
doc/source/cn/references/components/textarea.md | 2 +-
doc/source/cn/references/components/video.md | 2 +-
doc/source/cn/references/components/web.md | 2 +-
doc/source/cn/references/gesture.md | 3 +-
doc/source/cn/references/ios-apis.md | 4 +-
doc/source/cn/references/js-service/index.md | 118 +
.../cn/references/migration/difference.md | 2 +-
doc/source/cn/references/migration/index.md | 2 +-
.../references/migration/migration-from-weex.md | 2 +-
doc/source/cn/references/modules/animation.md | 4 +-
doc/source/cn/references/modules/clipboard.md | 2 +-
doc/source/cn/references/modules/dom.md | 8 +-
doc/source/cn/references/modules/globalevent.md | 2 +-
doc/source/cn/references/modules/index.md | 31 +-
doc/source/cn/references/modules/modal.md | 2 +-
doc/source/cn/references/modules/navigator.md | 2 +-
doc/source/cn/references/modules/storage.md | 4 +-
doc/source/cn/references/modules/stream.md | 2 +-
doc/source/cn/references/modules/websocket.md | 215 ++
doc/source/cn/references/modules/webview.md | 2 +-
doc/source/cn/references/path.md | 32 +-
.../cn/references/vue/difference-of-vuex.md | 2 +-
.../cn/references/vue/difference-with-web.md | 9 +-
doc/source/cn/references/vue/index.md | 2 +-
.../cn/v-0.10/advanced/extend-to-html5.md | 2 +-
.../cn/v-0.10/advanced/integrate-to-android.md | 4 +-
.../cn/v-0.10/references/modules/globalevent.md | 2 +-
.../cn/v-0.10/references/modules/storage.md | 2 +-
doc/source/cn/v-0.10/tools/devtools.md | 4 +-
doc/source/faq.md | 5 +-
doc/source/guide/contributing.md | 106 +
doc/source/guide/dev-with-weexpack.md | 12 -
doc/source/guide/index.md | 49 +-
doc/source/guide/integrate-to-your-app.md | 274 +-
doc/source/guide/intro/devtools.md | 100 -
doc/source/guide/intro/using-vue.md | 2 +-
doc/source/guide/set-up-env.md | 93 +
doc/source/guide/tools/devtools.md | 100 +
doc/source/guide/tools/index.md | 11 +
doc/source/guide/tools/weexpack.md | 300 ++
doc/source/references/advanced/extend-jsfm.md | 159 +-
.../references/advanced/extend-to-android.md | 20 +-
.../references/advanced/extend-to-html5.md | 88 +-
.../advanced/integrate-devtool-to-android.md | 137 +-
.../advanced/integrate-devtool-to-ios.md | 184 +-
doc/source/references/android-apis.md | 211 +-
doc/source/references/common-style.md | 16 +-
doc/source/references/components/a.md | 2 +-
doc/source/references/components/cell.md | 4 +-
doc/source/references/components/div.md | 6 +-
doc/source/references/components/image.md | 11 +-
doc/source/references/components/indicator.md | 6 +-
doc/source/references/components/input.md | 4 +-
doc/source/references/components/list.md | 4 +-
doc/source/references/components/refresh.md | 4 +-
doc/source/references/components/scroller.md | 10 +-
doc/source/references/components/slider.md | 12 +-
doc/source/references/components/switch.md | 4 +-
doc/source/references/components/text.md | 2 +-
doc/source/references/components/textarea.md | 4 +-
doc/source/references/components/video.md | 4 +-
doc/source/references/components/web.md | 6 +-
doc/source/references/gesture.md | 2 +-
doc/source/references/ios-apis.md | 70 +-
doc/source/references/modules/animation.md | 2 +-
doc/source/references/modules/clipboard.md | 2 +-
doc/source/references/modules/dom.md | 8 +-
doc/source/references/modules/globalevent.md | 6 +-
doc/source/references/modules/index.md | 31 +-
doc/source/references/modules/modal.md | 2 +-
doc/source/references/modules/navigator.md | 2 +-
doc/source/references/modules/storage.md | 4 +-
doc/source/references/modules/stream.md | 2 +-
doc/source/references/modules/websocket.md | 214 ++
doc/source/references/modules/webview.md | 8 +-
doc/source/references/native-dom-api.md | 203 +-
doc/source/references/platfrom-difference.md | 11 +
doc/source/references/vue/difference-of-vuex.md | 85 +-
.../references/vue/difference-with-web.md | 143 +-
doc/source/references/weex-variable.md | 41 +-
doc/source/v-0.10/advanced/extend-to-html5.md | 2 +-
.../v-0.10/advanced/integrate-to-android.md | 6 +-
.../guide/how-to/preview-in-playground-app.md | 2 +-
.../v-0.10/references/modules/globalevent.md | 2 +-
doc/themes/weex/languages/cn.yml | 5 +-
doc/themes/weex/languages/en.yml | 45 +-
.../weex/layout/_partial/after-footer.ejs | 2 +-
doc/themes/weex/layout/_partial/footer.ejs | 8 +-
doc/themes/weex/layout/_partial/header.ejs | 30 +-
doc/themes/weex/layout/_partial/search-form.ejs | 2 +-
doc/themes/weex/layout/_partial/sidebar.ejs | 15 +-
doc/themes/weex/layout/_partial/slider.ejs | 2 +-
doc/themes/weex/layout/index.ejs | 29 +-
doc/themes/weex/source/css/index.scss | 4 +-
doc/themes/weex/source/css/media-queries.scss | 3 +
doc/themes/weex/source/css/partial/footer.scss | 1 +
doc/themes/weex/source/css/partial/header.scss | 32 +-
.../weex/source/css/partial/search-form.scss | 3 -
doc/themes/weex/source/css/partial/sidebar.scss | 1 +
doc/themes/weex/source/js/common.js | 77 +-
doc/themes/weex/source/js/example.js | 2 +-
examples/component/image-demo.we | 2 +-
examples/component/input-demo.we | 253 +-
examples/component/list/list-basic.we | 79 +-
examples/component/scroller-demo.we | 64 +-
examples/component/slider-tab.we | 100 +
examples/include/example-list-item.we | 30 +-
examples/index.we | 4 +-
examples/module/chatroom-demo.we | 227 ++
examples/module/websocket-demo.we | 52 +-
examples/showcase/boxshadow.we | 46 +
examples/vue/components/input.vue | 203 +-
examples/vue/components/list.vue | 3 +
examples/vue/components/waterfall.vue | 17 +-
examples/vue/index.vue | 1 +
examples/vue/showcase/boxshadow.vue | 39 +
html5/frameworks/legacy/app/ctrl/init.js | 2 +
html5/shared/freeze.js | 58 +-
html5/test/unit/shared/index.js | 2 +-
ios/playground/WeexDemo/Info.plist | 2 +-
ios/playground/WeexDemo/WXDemoViewController.m | 2 +-
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 +-
ios/sdk/WeexSDK.podspec | 2 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 +-
ios/sdk/WeexSDK/Resources/main.js | 14 +-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.h | 2 +-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 2 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 18 +-
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 15 +-
.../Component/Recycler/WXMultiColumnLayout.h | 2 +
.../Component/Recycler/WXMultiColumnLayout.m | 10 +-
.../Component/Recycler/WXRecyclerComponent.m | 143 +-
.../Recycler/WXRecyclerDataController.h | 4 +
.../Recycler/WXRecyclerDataController.m | 18 +
.../Recycler/WXRecyclerUpdateController.m | 14 +-
.../Component/WXComponent+GradientColor.m | 3 +
.../Sources/Component/WXImageComponent.m | 1 +
.../WeexSDK/Sources/Component/WXListComponent.m | 90 +-
.../Sources/Component/WXLoadingComponent.m | 13 -
.../Sources/Component/WXRefreshComponent.m | 18 +-
.../Sources/Component/WXScrollerComponent.m | 28 +-
.../Sources/Component/WXSliderComponent.m | 9 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 2 +-
.../Sources/Display/WXComponent+BoxShadow.h | 5 +-
.../Sources/Display/WXComponent+BoxShadow.m | 22 +-
.../WeexSDK/Sources/Events/WXComponent+Events.m | 4 +
ios/sdk/WeexSDK/Sources/Layout/Layout.c | 3 +
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 16 +-
.../Sources/Manager/WXComponentManager.m | 3 +-
.../Sources/Manager/WXInvocationConfig.h | 1 -
.../Sources/Manager/WXInvocationConfig.m | 12 -
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 5 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 46 +-
.../WeexSDK/Sources/Module/WXNavigatorModule.m | 5 +-
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 239 +-
.../WXResourceRequestHandlerDefaultImpl.m | 7 +-
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.m | 40 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 42 +-
.../Sources/View/WXComponent+ViewManagement.m | 2 +
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
package.json | 18 +-
test/ci-funcs.sh | 6 +-
test/pages/components/recycler.vue | 487 +++
test/scripts/components/recycler.test.js | 412 +++
504 files changed, 45290 insertions(+), 10219 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3e6f1c95/android/playground/app/src/main/assets/component/image-demo.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3e6f1c95/android/playground/app/src/main/assets/component/text-demo.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3e6f1c95/android/playground/app/src/main/assets/module/clipboard.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3e6f1c95/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3e6f1c95/android/sdk/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3e6f1c95/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index d501ffb,c70b405..8b0e3d7
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@@ -249,10 -249,8 +249,9 @@@ import com.taobao.weex.ui.component.Nes
import com.taobao.weex.ui.component.WXBasicComponentType;
import com.taobao.weex.ui.component.WXComponent;
import com.taobao.weex.ui.component.WXComponentFactory;
- import com.taobao.weex.ui.component.WXVContainer;
import com.taobao.weex.ui.view.WXScrollView;
import com.taobao.weex.ui.view.WXScrollView.WXScrollViewListener;
+import com.taobao.weex.utils.Trace;
import com.taobao.weex.utils.WXFileUtils;
import com.taobao.weex.utils.WXJsonUtils;
import com.taobao.weex.utils.WXLogUtils;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3e6f1c95/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3e6f1c95/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3e6f1c95/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3e6f1c95/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
index 8907dab,77492b5..11a4d48
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
@@@ -208,9 -208,8 +208,10 @@@ import android.content.Context
import android.content.pm.ApplicationInfo;
import android.os.Build;
+import com.taobao.weex.IWXStatisticsListener;
+ import com.taobao.weappplus_sdk.BuildConfig;
import com.taobao.weex.WXEnvironment;
+import com.taobao.weex.adapter.IWXSoLoaderAdapter;
import com.taobao.weex.adapter.IWXUserTrackAdapter;
import com.taobao.weex.common.WXErrorCode;
import com.taobao.weex.common.WXPerformance;
@@@ -252,20 -251,13 +253,20 @@@ public class WXSoInstallMgrSdk
private final static String ARMEABI = "armeabi"; //default
private final static String X86 = "x86";
private final static String MIPS = "mips";
- private final static int ARMEABI_Size = 3649404;
- //private final static int ARMEABI_Size = 124236;
- private final static int X86_Size = 4451068;
++
+ private final static int ARMEABI_Size = 3583820;
+ private final static int X86_Size = 4340864;
static Context mContext = null;
+ private static IWXSoLoaderAdapter mSoLoader = null;
+ private static IWXStatisticsListener mStatisticsListener = null;
- public static void init(Context c) {
+ public static void init(Context c,
+ IWXSoLoaderAdapter loader,
+ IWXStatisticsListener listener) {
mContext = c;
+ mSoLoader = loader;
+ mStatisticsListener = listener;
}
public static boolean isX86(){
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3e6f1c95/html5/frameworks/legacy/app/ctrl/init.js
----------------------------------------------------------------------