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/03/02 03:28:57 UTC
[23/25] incubator-weex git commit: Merge branch
'0.11-dev-suppport-recycler-component' of https://github.com/alibaba/weex
into 0.11-dev-suppport-recycler-component
Merge branch '0.11-dev-suppport-recycler-component' of https://github.com/alibaba/weex into 0.11-dev-suppport-recycler-component
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5139da89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5139da89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5139da89
Branch: refs/heads/0.11-dev-recycler
Commit: 5139da89b5a34d68d38cb13244920f91f375fdeb
Parents: e37d14f bf32a40
Author: zshshr <zh...@gmail.com>
Authored: Mon Feb 27 11:43:22 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Mon Feb 27 11:43:22 2017 +0800
----------------------------------------------------------------------
.travis.yml | 2 +
.../commons/adapter/JSExceptionAdapter.java | 222 ++
.../java/com/alibaba/weex/WXApplication.java | 2 +
.../zxing/client/android/CaptureActivity.java | 1 +
android/run-ci.sh | 2 +-
android/sdk/libs/armeabi/libweexv8.so | Bin 3583820 -> 3583820 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4340864 -> 4340864 bytes
.../main/java/com/taobao/weex/InitConfig.java | 13 +
.../main/java/com/taobao/weex/WXSDKEngine.java | 5 +
.../java/com/taobao/weex/WXSDKInstance.java | 4 +-
.../main/java/com/taobao/weex/WXSDKManager.java | 14 +
.../weex/adapter/IWXJSExceptionAdapter.java | 218 ++
.../appfram/navigator/WXNavigatorModule.java | 82 +-
.../com/taobao/weex/bridge/WXBridgeManager.java | 68 +-
.../com/taobao/weex/bridge/WXModuleManager.java | 29 +-
.../taobao/weex/bridge/WXServiceManager.java | 31 +-
.../taobao/weex/common/WXJSExceptionInfo.java | 331 ++
.../com/taobao/weex/common/WXJSService.java | 229 ++
.../com/taobao/weex/http/WXStreamModule.java | 2 +-
.../java/com/taobao/weex/ui/component/WXA.java | 10 +-
.../taobao/weex/ui/component/WXComponent.java | 3 +-
.../com/taobao/weex/ui/component/WXImage.java | 14 +-
.../weex/ui/component/WXSliderNeighbor.java | 70 +-
.../main/java/com/taobao/weex/utils/WXHack.java | 527 ---
.../java/com/taobao/weex/utils/WXUtils.java | 200 +-
.../java/com/taobao/weex/utils/WXViewUtils.java | 8 +-
.../java/com/taobao/weex/utils/WXUtilsTest.java | 125 +-
doc/advanced/extend-to-android.md | 175 +
doc/package.json | 5 +-
doc/source/cn/guide/intro/app-architecture.md | 34 +-
doc/source/cn/guide/intro/devtools.md | 99 +
doc/source/cn/guide/intro/how-it-works.md | 38 +-
doc/source/cn/guide/intro/page-architecture.md | 18 +-
doc/source/cn/guide/intro/using-vue.md | 79 +-
doc/source/cn/guide/intro/web-dev-experience.md | 20 +-
.../cn/references/advanced/extend-to-android.md | 26 +
.../cn/references/advanced/extend-to-ios.md | 45 +-
doc/source/cn/references/common-style.md | 157 +
doc/source/cn/references/components/image.md | 4 +-
doc/source/cn/references/components/input.md | 11 +-
doc/source/cn/references/components/textarea.md | 7 +
.../cn/v-0.10/advanced/extend-to-android.md | 27 +-
doc/source/cn/v-0.10/advanced/extend-to-ios.md | 154 +-
doc/source/guide/intro/app-architecture.md | 57 +-
doc/source/guide/intro/devtools.md | 100 +
doc/source/guide/intro/how-it-works.md | 62 +-
doc/source/guide/intro/index.md | 4 +-
doc/source/guide/intro/page-architecture.md | 42 +-
doc/source/guide/intro/using-vue.md | 52 +-
doc/source/guide/intro/web-dev-experience.md | 29 +-
doc/source/guide/intro/write-once.md | 19 +-
doc/source/references/advanced/extend-jsfm.md | 2 +-
.../references/advanced/extend-to-android.md | 29 +-
.../references/advanced/extend-to-html5.md | 2 +-
doc/source/references/advanced/extend-to-ios.md | 80 +-
doc/source/references/advanced/index.md | 2 +-
.../advanced/integrate-devtool-to-android.md | 2 +-
.../advanced/integrate-devtool-to-ios.md | 2 +-
doc/source/references/common-style.md | 159 +
doc/source/references/components/cell.md | 6 +-
doc/source/references/components/image.md | 3 +-
doc/source/references/components/input.md | 7 +
doc/source/references/components/textarea.md | 7 +
doc/source/references/gesture.md | 9 +-
doc/source/references/js-service/index.md | 114 +
doc/source/references/vue/difference-of-vuex.md | 2 +-
.../references/vue/difference-with-web.md | 2 +-
doc/source/references/vue/index.md | 2 +-
doc/source/v-0.10/advanced/extend-to-android.md | 57 +-
doc/source/v-0.10/advanced/extend-to-ios.md | 39 +
examples/index.we | 1 +
examples/linear-gradient.we | 70 +
examples/vue/components/waterfall.vue | 455 +++
examples/vue/index.vue | 1 +
html5/frameworks/legacy/app/ctrl/init.js | 2 -
html5/frameworks/legacy/app/ctrl/misc.js | 55 +-
html5/frameworks/legacy/app/instance.js | 14 +-
html5/frameworks/legacy/static/create.js | 6 +-
html5/runtime/config.js | 4 +-
html5/runtime/init.js | 4 -
html5/runtime/task-center.js | 57 +
html5/services/amd/index.js | 18 +-
html5/test/case/prepare.js | 6 +-
html5/test/case/tester.js | 48 +-
html5/test/unit/default/app/ctrl.js | 14 +-
html5/test/unit/default/app/index.js | 28 +-
.../WeexDemo.xcodeproj/project.pbxproj | 11 +-
.../AppIcon.appiconset/Icon-29.png | Bin 1682 -> 1614 bytes
.../AppIcon.appiconset/Icon-29@2x-1.png | Bin 2709 -> 2421 bytes
.../AppIcon.appiconset/Icon-29@2x.png | Bin 2709 -> 2421 bytes
.../AppIcon.appiconset/Icon-29@3x.png | Bin 3724 -> 3236 bytes
.../AppIcon.appiconset/Icon-40.png | Bin 2018 -> 1946 bytes
.../AppIcon.appiconset/Icon-40@2x-1.png | Bin 3368 -> 3016 bytes
.../AppIcon.appiconset/Icon-40@2x.png | Bin 3368 -> 3016 bytes
.../AppIcon.appiconset/Icon-40@3x.png | Bin 4715 -> 4172 bytes
.../AppIcon.appiconset/Icon-60@2x.png | Bin 4715 -> 4172 bytes
.../AppIcon.appiconset/Icon-60@3x.png | Bin 6892 -> 6017 bytes
.../AppIcon.appiconset/Icon-76.png | Bin 3324 -> 2918 bytes
.../AppIcon.appiconset/Icon-76@2x.png | Bin 5937 -> 5088 bytes
.../AppIcon.appiconset/Icon-83.5@2x.png | Bin 6942 -> 5537 bytes
ios/playground/WeexDemo/DemoDefine.h | 2 +-
ios/playground/WeexDemo/Info.plist | 11 +-
ios/playground/WeexDemo/UIView+UIThreadCheck.m | 2 +-
ios/playground/WeexDemo/WXDemoViewController.m | 3 +-
ios/playground/bundlejs/animation.js | 3 +-
ios/playground/bundlejs/component/a-demo.js | 3 +-
.../bundlejs/component/countdown-demo.js | 3 +-
ios/playground/bundlejs/component/image-demo.js | 3 +-
ios/playground/bundlejs/component/input-demo.js | 3 +-
.../bundlejs/component/list/list-demo.js | 3 +-
.../bundlejs/component/marquee-demo.js | 3 +-
.../bundlejs/component/navigator-demo.js | 8 +-
.../bundlejs/component/process-bar-demo.js | 3 +-
.../bundlejs/component/scroller-demo.js | 3 +-
.../bundlejs/component/slider-neighbor/index.js | 264 ++
.../slider-neighbor/silder-neighbor.js | 287 --
.../bundlejs/component/slider/index.js | 36 +-
.../bundlejs/component/tabbar/tabbar-demo.js | 5 +-
ios/playground/bundlejs/component/text-demo.js | 111 +-
ios/playground/bundlejs/component/video-demo.js | 3 +-
ios/playground/bundlejs/component/web-demo.js | 11 +-
ios/playground/bundlejs/error.js | 3 +-
ios/playground/bundlejs/index.js | 7 +-
ios/playground/bundlejs/linear-gradient.js | 367 ++
ios/playground/bundlejs/module/clipboard.js | 20 +-
ios/playground/bundlejs/module/componentRect.js | 563 +++
ios/playground/bundlejs/module/instance-api.js | 18 +-
ios/playground/bundlejs/module/modal.js | 22 +-
ios/playground/bundlejs/module/picker-demo.js | 22 +-
ios/playground/bundlejs/module/storage-demo.js | 18 +-
ios/playground/bundlejs/module/stream-demo.js | 22 +-
.../bundlejs/module/websocket-demo.js | 2409 +++++++++++++
ios/playground/bundlejs/showcase/calculator.js | 25 +-
.../bundlejs/showcase/dropdown/dropdown-demo.js | 30 +-
.../bundlejs/showcase/dropdown/we-dropdown.js | 12 +-
ios/playground/bundlejs/showcase/minesweeper.js | 18 +-
.../bundlejs/showcase/new-fashion/banner.js | 8 +-
.../bundlejs/showcase/new-fashion/banners.js | 20 +-
.../bundlejs/showcase/new-fashion/brand.js | 36 +-
.../bundlejs/showcase/new-fashion/category.js | 24 +-
.../bundlejs/showcase/new-fashion/coupon.js | 12 +-
.../bundlejs/showcase/new-fashion/fashion.js | 38 +-
.../bundlejs/showcase/new-fashion/goods.js | 24 +-
.../bundlejs/showcase/new-fashion/headlines.js | 48 +-
.../bundlejs/showcase/new-fashion/image-demo.js | 3 +-
.../bundlejs/showcase/new-fashion/index.js | 27 +-
.../bundlejs/showcase/new-fashion/link.js | 8 +-
.../showcase/new-fashion/list/list-demo.js | 3 +-
.../bundlejs/showcase/new-fashion/main.js | 213 +-
.../bundlejs/showcase/new-fashion/match.js | 24 +-
.../bundlejs/showcase/new-fashion/resource.js | 38 +-
.../bundlejs/showcase/new-fashion/scene.js | 24 +-
.../bundlejs/showcase/pseudo-class.js | 2422 +++++++++++++
ios/playground/bundlejs/showcase/ui.js | 28 +-
ios/playground/bundlejs/style/index.js | 80 +-
ios/playground/bundlejs/style/style-box.js | 44 +-
ios/playground/bundlejs/style/style-flex.js | 52 +-
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 | 6 +-
ios/playground/bundlejs/syntax/hello-world-3.js | 10 +-
ios/playground/bundlejs/syntax/hello-world-4.js | 14 +-
ios/playground/bundlejs/syntax/hello-world-5.js | 14 +-
ios/playground/bundlejs/syntax/hello-world.js | 14 +-
ios/playground/bundlejs/syntax/index.js | 28 +-
.../bundlejs/syntax/script-component.js | 24 +-
ios/playground/bundlejs/syntax/script-data.js | 12 +-
ios/playground/bundlejs/syntax/script-events.js | 12 +-
.../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 | 15 +-
ios/playground/bundlejs/test.js | 128 +
ios/playground/bundlejs/vue/animation.js | 709 ++++
ios/playground/bundlejs/vue/components/a.js | 438 +++
.../bundlejs/vue/components/countdown.js | 640 ++++
ios/playground/bundlejs/vue/components/image.js | 641 ++++
ios/playground/bundlejs/vue/components/input.js | 364 ++
ios/playground/bundlejs/vue/components/list.js | 246 ++
.../bundlejs/vue/components/marquee.js | 534 +++
.../bundlejs/vue/components/navigator.js | 1059 ++++++
.../bundlejs/vue/components/scroller.js | 304 ++
.../bundlejs/vue/components/slider.js | 898 +++++
.../bundlejs/vue/components/tabbar.js | 599 ++++
ios/playground/bundlejs/vue/components/text.js | 513 +++
ios/playground/bundlejs/vue/components/video.js | 396 +++
ios/playground/bundlejs/vue/components/web.js | 459 +++
ios/playground/bundlejs/vue/hello.js | 99 +
ios/playground/bundlejs/vue/iconfont.js | 204 ++
ios/playground/bundlejs/vue/index.js | 496 +++
.../bundlejs/vue/modules/clipboard.js | 691 ++++
.../bundlejs/vue/modules/instance-api.js | 304 ++
ios/playground/bundlejs/vue/modules/modal.js | 581 +++
ios/playground/bundlejs/vue/modules/storage.js | 381 ++
ios/playground/bundlejs/vue/modules/stream.js | 477 +++
.../bundlejs/vue/showcase/calculator.js | 340 ++
.../bundlejs/vue/showcase/itemlist.js | 1062 ++++++
.../bundlejs/vue/showcase/new-fashion.js | 3302 ++++++++++++++++++
.../bundlejs/vue/showcase/progress.js | 336 ++
ios/playground/bundlejs/vue/style/index.js | 1566 +++++++++
ios/playground/bundlejs/vue/style/style-box.js | 780 +++++
ios/playground/bundlejs/vue/style/style-flex.js | 919 +++++
ios/playground/bundlejs/vue/style/style-item.js | 155 +
.../bundlejs/vue/syntax/hello-world-1.js | 95 +
.../bundlejs/vue/syntax/hello-world-2.js | 112 +
.../bundlejs/vue/syntax/hello-world-3.js | 127 +
.../bundlejs/vue/syntax/hello-world-4.js | 167 +
.../bundlejs/vue/syntax/hello-world-5.js | 173 +
.../bundlejs/vue/syntax/hello-world.js | 183 +
.../bundlejs/vue/syntax/script-component.js | 224 ++
.../bundlejs/vue/syntax/script-data.js | 214 ++
.../bundlejs/vue/syntax/script-events.js | 161 +
.../bundlejs/vue/syntax/script-instance.js | 196 ++
.../bundlejs/vue/syntax/script-lifecycle.js | 155 +
.../bundlejs/vue/syntax/script-module.js | 156 +
.../bundlejs/vue/syntax/script-options.js | 182 +
.../bundlejs/vue/syntax/template-class.js | 161 +
.../bundlejs/vue/syntax/template-content.js | 189 +
.../bundlejs/vue/syntax/template-event.js | 197 ++
.../bundlejs/vue/syntax/template-if.js | 165 +
.../vue/syntax/template-repeat-update.js | 195 ++
.../bundlejs/vue/syntax/template-repeat.js | 170 +
.../bundlejs/vue/syntax/template-style.js | 144 +
ios/playground/bundlejs/vue/template.js | 796 +++++
ios/sdk/WeexSDK.podspec | 2 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 99 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 8 +
.../Component/Recycler/WXMultiColumnLayout.h | 42 +
.../Component/Recycler/WXMultiColumnLayout.m | 385 ++
.../Component/Recycler/WXRecyclerComponent.h | 12 +
.../Component/Recycler/WXRecyclerComponent.m | 525 +++
.../Recycler/WXRecyclerDataController.h | 34 +
.../Recycler/WXRecyclerDataController.m | 114 +
.../Recycler/WXRecyclerUpdateController.h | 32 +
.../Recycler/WXRecyclerUpdateController.m | 239 ++
.../Recycler/WXSectionDataController.h | 33 +
.../Recycler/WXSectionDataController.m | 81 +
.../WeexSDK/Sources/Component/WXCellComponent.h | 22 +-
.../WeexSDK/Sources/Component/WXCellComponent.m | 27 +-
.../Component/WXComponent+GradientColor.h | 15 +-
.../Component/WXComponent+GradientColor.m | 15 +-
.../Sources/Component/WXComponent_internal.h | 3 +
.../WeexSDK/Sources/Component/WXEditComponent.h | 21 +
.../WeexSDK/Sources/Component/WXEditComponent.m | 761 ++++
.../Sources/Component/WXFooterComponent.h | 13 +
.../Sources/Component/WXFooterComponent.m | 13 +
.../Sources/Component/WXHeaderComponent.h | 27 +
.../Sources/Component/WXHeaderComponent.m | 68 +
.../WeexSDK/Sources/Component/WXListComponent.h | 12 -
.../WeexSDK/Sources/Component/WXListComponent.m | 69 +-
.../Sources/Component/WXSliderComponent.m | 35 +-
.../Sources/Component/WXTextAreaComponent.h | 5 +-
.../Sources/Component/WXTextAreaComponent.m | 609 +---
.../Sources/Component/WXTextInputComponent.h | 8 +-
.../Sources/Component/WXTextInputComponent.m | 605 +---
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 18 +-
.../Sources/Display/WXComponent+BoxShadow.h | 37 +
.../Sources/Display/WXComponent+BoxShadow.m | 91 +
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.h | 19 +
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.m | 87 +
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 22 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 4 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 11 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 13 +-
ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m | 4 +-
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.h | 31 +
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.m | 108 +
ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 5 +
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 45 +
ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h | 38 +
ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m | 186 +
ios/sdk/WeexSDK/Sources/Utility/WXLength.h | 13 +-
ios/sdk/WeexSDK/Sources/Utility/WXLength.m | 45 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 12 +-
.../Sources/View/WXComponent+ViewManagement.m | 15 +
package.json | 6 +-
test/run.sh | 2 +-
test/scripts/components/scroll-event.test.js | 32 +-
test/scripts/dom.test.js | 14 +-
test/scripts/index.test.js | 14 +-
test/scripts/util.js | 24 +
289 files changed, 37990 insertions(+), 3222 deletions(-)
----------------------------------------------------------------------