You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by da...@apache.org on 2017/03/14 03:44:15 UTC
[7/8] incubator-weex git commit: Merge branch '0.11-dev' into
jsfm-feature-0.19
Merge branch '0.11-dev' into jsfm-feature-0.19
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ca21f8b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ca21f8b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ca21f8b1
Branch: refs/heads/0.11-dev
Commit: ca21f8b1eb52ff4f1192530037fc3fd0b149b1a2
Parents: 0335160 5484be3
Author: fkysly <fk...@hotmail.com>
Authored: Mon Mar 13 14:20:35 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Mon Mar 13 14:20:35 2017 +0800
----------------------------------------------------------------------
.eslintignore | 2 +
.eslintrc | 1 +
.gitignore | 4 +
.travis.yml | 56 +-
.wwprc | 3 +-
Dangerfile | 83 +
Dangerfile-ios | 4 +
Gemfile | 15 +
Gemfile.lock | 122 +
README.md | 2 +-
android/.gitignore | 3 +-
android/commons/build.gradle | 12 +-
.../weex/commons/AbstractWeexActivity.java | 2 +-
.../commons/adapter/JSExceptionAdapter.java | 222 ++
android/playground/app/build.gradle | 9 +-
.../java/com/alibaba/weex/IndexActivity.java | 204 ++
.../java/com/alibaba/weex/SplashActivity.java | 204 ++
.../java/com/alibaba/weex/WXApplication.java | 206 ++
.../java/com/alibaba/weex/WXBaseActivity.java | 204 ++
.../java/com/alibaba/weex/WXDebugActivity.java | 204 ++
.../java/com/alibaba/weex/WXPageActivity.java | 204 ++
.../com/alibaba/weex/constants/Constants.java | 204 ++
.../alibaba/weex/extend/PlayDebugAdapter.java | 204 ++
.../extend/adapter/InterceptWXHttpAdapter.java | 204 ++
.../alibaba/weex/extend/component/RichText.java | 204 ++
.../extend/component/WXComponentSyncTest.java | 204 ++
.../weex/extend/module/GeolocationModule.java | 204 ++
.../alibaba/weex/extend/module/MyModule.java | 204 ++
.../weex/extend/module/RenderModule.java | 204 ++
.../weex/extend/module/SyncTestModule.java | 204 ++
.../weex/extend/module/WXEventModule.java | 204 ++
.../extend/module/location/DefaultLocation.java | 204 ++
.../weex/extend/module/location/ILocatable.java | 204 ++
.../extend/module/location/LocationFactory.java | 204 ++
.../alibaba/weex/https/HotRefreshManager.java | 204 ++
.../com/alibaba/weex/https/WXHttpManager.java | 204 ++
.../com/alibaba/weex/https/WXHttpResponse.java | 204 ++
.../java/com/alibaba/weex/https/WXHttpTask.java | 204 ++
.../alibaba/weex/https/WXOkHttpDispatcher.java | 204 ++
.../alibaba/weex/https/WXRequestListener.java | 204 ++
.../zxing/client/android/CaptureActivity.java | 1 +
.../com.taobao.taobao_2016.11.21_17.35.li | Bin 2415126 -> 0 bytes
android/sdk/assets/main.js | 14 +-
android/sdk/build.gradle | 70 +-
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 | 16 +-
.../java/com/taobao/weex/WXSDKInstance.java | 28 +-
.../main/java/com/taobao/weex/WXSDKManager.java | 25 +
.../weex/adapter/IWXJSExceptionAdapter.java | 218 ++
.../appfram/navigator/WXNavigatorModule.java | 82 +-
.../weex/appfram/pickers/WXPickersModule.java | 8 +-
.../appfram/storage/WXSQLiteOpenHelper.java | 2 -
.../com/taobao/weex/bridge/WXBridgeManager.java | 184 +-
.../com/taobao/weex/bridge/WXModuleManager.java | 29 +-
.../taobao/weex/bridge/WXServiceManager.java | 31 +-
.../taobao/weex/bridge/WXValidateProcessor.java | 230 ++
.../java/com/taobao/weex/common/Constants.java | 36 +-
.../taobao/weex/common/WXJSExceptionInfo.java | 331 ++
.../com/taobao/weex/common/WXJSService.java | 229 ++
.../java/com/taobao/weex/common/WXThread.java | 9 +
.../com/taobao/weex/dom/CSSAlignConvert.java | 204 ++
.../weex/dom/CSSFlexDirectionConvert.java | 204 ++
.../com/taobao/weex/dom/CSSJustifyConvert.java | 204 ++
.../taobao/weex/dom/CSSPositionTypeConvert.java | 204 ++
.../com/taobao/weex/dom/CSSWrapConvert.java | 204 ++
.../com/taobao/weex/dom/ImmutableDomObject.java | 18 +-
.../main/java/com/taobao/weex/dom/WXAttr.java | 107 +-
.../com/taobao/weex/dom/WXCustomStyleSpan.java | 207 +-
.../java/com/taobao/weex/dom/WXDomHandler.java | 4 +-
.../java/com/taobao/weex/dom/WXDomManager.java | 6 +-
.../java/com/taobao/weex/dom/WXDomModule.java | 18 +-
.../java/com/taobao/weex/dom/WXDomObject.java | 26 +-
.../taobao/weex/dom/WXRecyclerDomObject.java | 317 ++
.../main/java/com/taobao/weex/dom/WXStyle.java | 44 +-
.../com/taobao/weex/dom/WXTextDomObject.java | 206 +-
.../java/com/taobao/weex/dom/flex/CSSNode.java | 8 +-
.../com/taobao/weex/http/WXStreamModule.java | 30 +-
.../com/taobao/weex/ui/WXRenderStatement.java | 28 +-
.../ui/animation/BackgroundColorProperty.java | 252 ++
.../weex/ui/animation/WXAnimationModule.java | 24 +-
.../ui/component/AbstractEditComponent.java | 142 +-
.../taobao/weex/ui/component/Scrollable.java | 4 +-
.../java/com/taobao/weex/ui/component/WXA.java | 10 +-
.../taobao/weex/ui/component/WXBaseRefresh.java | 10 -
.../weex/ui/component/WXBasicComponentType.java | 2 +
.../taobao/weex/ui/component/WXComponent.java | 46 +-
.../com/taobao/weex/ui/component/WXEmbed.java | 3 +
.../com/taobao/weex/ui/component/WXHeader.java | 4 +-
.../com/taobao/weex/ui/component/WXImage.java | 29 +-
.../com/taobao/weex/ui/component/WXLoading.java | 7 +-
.../taobao/weex/ui/component/WXScroller.java | 146 +-
.../com/taobao/weex/ui/component/WXSlider.java | 20 +-
.../weex/ui/component/WXSliderNeighbor.java | 39 +-
.../taobao/weex/ui/component/WXVContainer.java | 14 +
.../ui/component/helper/WXStickyHelper.java | 11 +-
.../ui/component/list/BasicListComponent.java | 305 +-
.../ui/component/list/ListComponentView.java | 4 +-
.../ui/component/list/SimpleListComponent.java | 6 +-
.../ui/component/list/SimpleRecyclerView.java | 5 +
.../weex/ui/component/list/WXListComponent.java | 91 +-
.../weex/ui/component/pesudo/PesudoStatus.java | 18 +-
.../com/taobao/weex/ui/module/WXMetaModule.java | 4 +-
.../taobao/weex/ui/module/WXTimerModule.java | 139 +-
.../taobao/weex/ui/view/WXCircleViewPager.java | 38 +-
.../com/taobao/weex/ui/view/WXImageView.java | 20 +-
.../com/taobao/weex/ui/view/WXScrollView.java | 8 +-
.../weex/ui/view/border/BorderDrawable.java | 35 +-
.../taobao/weex/ui/view/border/BorderEdge.java | 77 +-
.../weex/ui/view/border/BorderRadiusType.java | 222 ++
.../view/border/BorderWidthStyleColorType.java | 224 ++
.../listview/ExtendedLinearLayoutManager.java | 281 ++
.../weex/ui/view/listview/WXRecyclerView.java | 44 +-
.../listview/adapter/ListBaseViewHolder.java | 44 +-
.../adapter/RecyclerViewBaseAdapter.java | 21 +-
.../adapter/WXRecyclerViewOnScrollListener.java | 99 +-
.../ui/view/refresh/wrapper/BaseBounceView.java | 74 +-
.../refresh/wrapper/BounceRecyclerView.java | 32 +-
.../refresh/wrapper/BounceScrollerView.java | 1 +
.../taobao/weex/utils/WXDataStructureUtil.java | 211 +-
.../java/com/taobao/weex/utils/WXFileUtils.java | 37 +-
.../main/java/com/taobao/weex/utils/WXHack.java | 527 ---
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 9 +-
.../java/com/taobao/weex/utils/WXUtils.java | 200 +-
.../java/com/taobao/weex/utils/WXViewUtils.java | 81 +-
.../test/java/com/taobao/weex/TestActivity.java | 6 +-
.../ui/component/list/WXListComponentTest.java | 19 +-
.../weex/ui/module/WXTimerModuleTest.java | 151 +-
.../weex/ui/view/border/BorderDrawableTest.java | 4 +-
.../java/com/taobao/weex/utils/WXUtilsTest.java | 125 +-
bin/dist-browser.sh | 2 +-
build/build.js | 5 +
build/config.js | 5 +-
build/karma.vue.conf.js | 44 +
build/webpack.examples.web.config.js | 68 +
build/webpack.vue.config.js | 52 +
circle.yml | 3 +-
doc/advanced/extend-to-android.md | 175 +
doc/source/cn/guide/intro/app-architecture.md | 34 +-
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 +-
.../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/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 +-
.../references/advanced/extend-to-android.md | 27 +
doc/source/references/advanced/extend-to-ios.md | 78 +-
doc/source/references/components/cell.md | 6 +-
doc/source/references/gesture.md | 9 +-
doc/source/v-0.10/advanced/extend-to-android.md | 57 +-
doc/source/v-0.10/advanced/extend-to-ios.md | 39 +
examples/component/lengthunitwx-demo.we | 68 +
examples/component/slider-neighbor/index.we | 28 +-
examples/component/text-demo.we | 17 +-
examples/index.we | 4 +-
examples/linear-gradient.we | 70 +
examples/module/websocket-demo.we | 222 +-
examples/showcase/pseudo-class.we | 102 +
examples/vue/animation.vue | 2 +-
examples/vue/components/input.vue | 2 +-
examples/vue/components/navigator.vue | 2 +-
examples/vue/components/slider.vue | 18 +-
examples/vue/components/text.vue | 4 +-
examples/vue/components/video.vue | 2 +-
examples/vue/components/waterfall.vue | 459 +++
examples/vue/components/web.vue | 2 +-
examples/vue/iconfont.vue | 2 +-
examples/vue/include/base-url.js | 2 +-
examples/vue/include/example-list-item.vue | 2 +-
examples/vue/include/marquee.vue | 2 +-
examples/vue/index.vue | 54 +-
examples/vue/modules/clipboard.vue | 4 +-
examples/vue/modules/modal.vue | 2 +-
examples/vue/modules/storage.vue | 2 +-
examples/vue/modules/stream.vue | 2 +-
examples/vue/showcase/calculator.vue | 2 +-
examples/vue/showcase/include/banner.vue | 2 +-
examples/vue/showcase/include/coupon.vue | 2 +-
examples/vue/showcase/include/link.vue | 2 +-
examples/vue/showcase/itemlist.vue | 2 +-
examples/vue/showcase/new-fashion.vue | 4 +-
examples/vue/syntax/script-instance.vue | 2 +-
examples/vue/syntax/script-module.vue | 4 +-
examples/vue/template.vue | 2 +-
html5/render/browser/base/component/operate.js | 105 +-
.../browser/base/component/valueFilter.js | 26 +-
html5/render/browser/extend/api/globalEvent.js | 2 +-
.../browser/extend/components/richtext.js | 95 +
html5/render/browser/extend/components/text.js | 2 +-
html5/render/browser/render/index.js | 3 +-
html5/render/vue/.eslintrc | 5 +
html5/render/vue/README.md | 9 +
html5/render/vue/components/a.js | 24 +
html5/render/vue/components/div.js | 25 +
html5/render/vue/components/image.js | 39 +
html5/render/vue/components/index.js | 42 +
html5/render/vue/components/input.js | 53 +
.../render/vue/components/scrollable/header.js | 63 +
.../vue/components/scrollable/list/cell.js | 18 +
.../vue/components/scrollable/list/index.js | 71 +
.../vue/components/scrollable/list/listMixin.js | 117 +
.../components/scrollable/loading-indicator.js | 10 +
.../render/vue/components/scrollable/loading.js | 50 +
.../render/vue/components/scrollable/refresh.js | 51 +
.../vue/components/scrollable/scroller.js | 91 +
.../render/vue/components/scrollable/shared.js | 22 +
html5/render/vue/components/slider/index.js | 141 +
html5/render/vue/components/slider/indicator.js | 64 +
.../render/vue/components/slider/slideMixin.js | 113 +
html5/render/vue/components/switch.js | 57 +
html5/render/vue/components/text.js | 44 +
html5/render/vue/components/textarea.js | 43 +
html5/render/vue/components/video.js | 54 +
html5/render/vue/components/warning.js | 11 +
html5/render/vue/components/web.js | 52 +
html5/render/vue/env/WXEnvironment.js | 39 +
html5/render/vue/env/index.js | 24 +
html5/render/vue/env/viewport.js | 44 +
html5/render/vue/env/weex.js | 63 +
html5/render/vue/index.js | 43 +
html5/render/vue/mixins/base.js | 22 +
html5/render/vue/mixins/event.js | 76 +
html5/render/vue/mixins/index.js | 9 +
html5/render/vue/mixins/scrollable.js | 37 +
html5/render/vue/mixins/style.js | 167 +
html5/render/vue/modules/animation.js | 44 +
html5/render/vue/modules/dom.js | 86 +
html5/render/vue/modules/index.js | 38 +
html5/render/vue/modules/modal/alert.js | 44 +
html5/render/vue/modules/modal/confirm.js | 55 +
html5/render/vue/modules/modal/index.js | 48 +
html5/render/vue/modules/modal/modal.js | 62 +
html5/render/vue/modules/modal/prompt.js | 76 +
html5/render/vue/modules/modal/toast.js | 78 +
html5/render/vue/modules/navigator.js | 16 +
html5/render/vue/modules/webview.js | 21 +
html5/render/vue/styles/components.css | 506 +++
html5/render/vue/styles/reset.css | 64 +
html5/render/vue/utils/component.js | 61 +
html5/render/vue/utils/event.js | 57 +
html5/render/vue/utils/func.js | 41 +
html5/render/vue/utils/index.js | 103 +
html5/render/vue/validator/check.js | 88 +
html5/render/vue/validator/index.js | 74 +
html5/render/vue/validator/prop.js | 4 +
html5/render/vue/validator/style.js | 109 +
html5/test/render/index.js | 3 +
html5/test/render/vue/components/image.js | 49 +
html5/test/render/vue/components/list.js | 21 +
html5/test/render/vue/components/switch.js | 87 +
html5/test/render/vue/components/text.js | 72 +
html5/test/render/vue/components/web.js | 29 +
html5/test/render/vue/examples/list-cell.js | 37 +
html5/test/render/vue/helper.js | 31 +
html5/test/render/vue/utils.js | 48 +
html5/test/render/vue/validator/check.js | 38 +
html5/test/render/vue/validator/index.js | 43 +
html5/test/render/vue/validator/prop.js | 14 +
html5/test/render/vue/validator/style.js | 271 ++
html5/test/render/vue/vender/vue-2.0.0.js | 7 +
html5/test/render/vue/vender/vue-2.1.0.js | 8 +
ios/playground/Podfile | 4 +-
.../WeexDemo.xcodeproj/project.pbxproj | 60 +-
ios/playground/WeexDemo/AppDelegate.m | 18 +
.../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 | 6 +-
ios/playground/WeexDemo/Info.plist | 20 +-
ios/playground/WeexDemo/UIView+UIThreadCheck.h | 15 +
ios/playground/WeexDemo/UIView+UIThreadCheck.m | 42 +
ios/playground/WeexDemo/WXDemoViewController.m | 8 +-
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 | 143 +-
.../xcshareddata/xcschemes/WeexSDK.xcscheme | 2 +-
.../xcschemes/WeexSDKTests.xcscheme | 4 +-
ios/sdk/WeexSDK/Resources/main.js | 14 +-
.../WeexSDK/Sources/Bridge/WXBridgeContext.h | 5 +
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 11 +-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 40 +
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 26 +-
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 27 +-
.../Component/Recycler/WXMultiColumnLayout.h | 42 +
.../Component/Recycler/WXMultiColumnLayout.m | 388 ++
.../Component/Recycler/WXRecyclerComponent.h | 12 +
.../Component/Recycler/WXRecyclerComponent.m | 584 ++++
.../Recycler/WXRecyclerDataController.h | 34 +
.../Recycler/WXRecyclerDataController.m | 114 +
.../Recycler/WXRecyclerUpdateController.h | 32 +
.../Recycler/WXRecyclerUpdateController.m | 247 ++
.../Recycler/WXSectionDataController.h | 33 +
.../Recycler/WXSectionDataController.m | 81 +
.../WeexSDK/Sources/Component/WXCellComponent.h | 24 +-
.../WeexSDK/Sources/Component/WXCellComponent.m | 37 +-
.../Component/WXComponent+GradientColor.h | 15 +-
.../Component/WXComponent+GradientColor.m | 15 +-
.../Sources/Component/WXComponent_internal.h | 7 +-
.../WeexSDK/Sources/Component/WXEditComponent.h | 21 +
.../WeexSDK/Sources/Component/WXEditComponent.m | 780 +++++
.../Sources/Component/WXFooterComponent.h | 13 +
.../Sources/Component/WXFooterComponent.m | 13 +
.../Sources/Component/WXHeaderComponent.h | 28 +
.../Sources/Component/WXHeaderComponent.m | 76 +
.../Sources/Component/WXImageComponent.m | 3 +-
.../WeexSDK/Sources/Component/WXListComponent.h | 12 -
.../WeexSDK/Sources/Component/WXListComponent.m | 365 +-
.../Sources/Component/WXLoadingComponent.m | 17 +-
.../Sources/Component/WXLoadingIndicator.h | 1 -
.../Sources/Component/WXLoadingIndicator.m | 81 +-
.../Sources/Component/WXRefreshComponent.h | 6 +
.../Sources/Component/WXRefreshComponent.m | 36 +-
.../Sources/Component/WXScrollerComponent.m | 87 +-
.../Sources/Component/WXSliderComponent.m | 71 +-
.../Component/WXSliderNeighborComponent.m | 3 +-
.../Sources/Component/WXTextAreaComponent.h | 5 +-
.../Sources/Component/WXTextAreaComponent.m | 557 +--
.../WeexSDK/Sources/Component/WXTextComponent.m | 57 +-
.../Sources/Component/WXTextInputComponent.h | 8 +-
.../Sources/Component/WXTextInputComponent.m | 557 +--
ios/sdk/WeexSDK/Sources/Component/WXTransform.h | 15 +-
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 310 +-
.../Sources/Component/WXVideoComponent.m | 2 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 2 +-
.../Sources/Controller/WXBaseViewController.h | 2 +-
.../Sources/Controller/WXRootViewController.h | 2 +-
ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.h | 8 +
ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.m | 52 +-
.../Sources/Display/WXComponent+BoxShadow.h | 34 +
.../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.h | 9 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 37 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 2 +-
.../WeexSDK/Sources/Events/WXComponent+Events.m | 12 +-
.../Sources/Handler/WXNavigationDefaultImpl.m | 6 +-
ios/sdk/WeexSDK/Sources/Layout/Layout.c | 3 +
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 13 +-
.../WeexSDK/Sources/Manager/WXBridgeManager.h | 23 +-
.../WeexSDK/Sources/Manager/WXBridgeManager.m | 13 +
.../Sources/Manager/WXComponentManager.h | 4 +-
.../Sources/Manager/WXComponentManager.m | 26 +-
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 12 +-
.../WeexSDK/Sources/Manager/WXServiceFactory.m | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 6 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 13 +-
.../WeexSDK/Sources/Model/WXJSExceptionInfo.h | 60 +
.../WeexSDK/Sources/Model/WXJSExceptionInfo.m | 39 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 25 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 18 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 282 +-
.../WeexSDK/Sources/Module/WXClipboardModule.m | 4 +-
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 53 +-
.../Sources/Module/WXGlobalEventModule.m | 8 +-
ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m | 4 +-
.../WeexSDK/Sources/Module/WXModalUIModule.m | 4 +-
.../WeexSDK/Sources/Module/WXNavigatorModule.m | 22 +-
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 34 +-
.../WeexSDK/Sources/Module/WXStorageModule.m | 72 +-
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 242 +-
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 8 +-
.../WXResourceRequestHandlerDefaultImpl.m | 7 +-
.../Sources/Protocol/WXImgLoaderProtocol.h | 2 +-
.../Sources/Protocol/WXJSExceptionProtocol.h | 21 +
.../Sources/Protocol/WXNavigationProtocol.h | 8 +-
.../Sources/Protocol/WXScrollerProtocol.h | 2 +-
.../Sources/Protocol/WXValidateProtocol.h | 39 +
ios/sdk/WeexSDK/Sources/Utility/WXAssert.h | 3 +
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.h | 31 +
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.m | 108 +
ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 8 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 125 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 3 +-
ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h | 38 +
ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m | 186 +
ios/sdk/WeexSDK/Sources/Utility/WXLength.h | 40 +
ios/sdk/WeexSDK/Sources/Utility/WXLength.m | 92 +
.../Utility/WXSimulatorShortcutManager.m | 12 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 63 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 146 +-
.../Sources/View/WXComponent+ViewManagement.m | 35 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 6 +
ios/sdk/WeexSDK/dependency/SRWebSocket.m | 4 +-
ios/sdk/WeexSDKTests/WXComponentTests.m | 2 +-
ios/sdk/WeexSDKTests/WXFloatCompareTests.m | 82 +
ios/sdk/WeexSDKTests/WXRootViewTests.m | 35 +-
ios/sdk/WeexSDKTests/WXStorageTests.m | 25 +-
ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 30 -
package.json | 35 +-
packages/weex-html5/LICENSE | 201 ++
packages/weex-html5/NOTICE | 7 +
packages/weex-html5/README.md | 158 +
packages/weex-html5/demo/build/index.js | 111 +
packages/weex-html5/demo/index.we | 29 +
packages/weex-html5/index.html | 57 +
packages/weex-html5/package.json | 23 +
packages/weex-vue-render/README.md | 5 +
packages/weex-vue-render/package.json | 24 +
test/README.md | 3 +-
test/ci-funcs.sh | 117 +
test/mocha.opts | 2 +
test/pages/components/input.we | 0
test/pages/components/scroller-fixed.we | 62 +
test/pages/dom-operation.we | 32 +
test/pages/image-onload.we | 19 +
test/pages/list-scroll.we | 31 +
test/pages/scroller-scroll.we | 31 +
test/run.sh | 47 +-
test/scripts/components/image-onload.test.js | 39 +
test/scripts/components/scroll-event.test.js | 82 +
test/scripts/components/scroller-fixed.test.js | 39 +
test/scripts/dom.test.js | 67 +
test/scripts/index.test.js | 50 +-
test/scripts/test.js | 1 -
test/scripts/util.js | 81 +
test/scripts/weex-node-map.js | 17 -
test/scripts/weex.js | 129 -
vue.html | 43 +
566 files changed, 56110 insertions(+), 4735 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ca21f8b1/package.json
----------------------------------------------------------------------
diff --cc package.json
index a1f713f,213cae7..39c3f76
--- a/package.json
+++ b/package.json
@@@ -79,9 -85,11 +85,10 @@@
"query-string": "^4.2.3",
"scroll-to": "0.0.2",
"semver": "^5.1.0",
- "weex-components": "^0.2.0",
"weex-picker": "^0.1.0",
- "weex-rax-framework": "0.1.7",
- "weex-styler":"0.1.9",
- "weex-vue-framework": "2.1.8-weex.1"
+ "weex-rax-framework": "0.1.0",
- "weex-vue-framework": "2.2.1-weex.1"
++ "weex-vue-framework": "2.2.1-weex.1",
++ "weex-styler":"0.1.9"
},
"devDependencies": {
"xml2map": "^1.0.2",