Merge branch '0.16-dev' into 0.16-dev-web
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cda836a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cda836a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cda836a0 Branch: refs/heads/dev Commit: cda836a0f5526cbb6e5c73a408a019fce0203dd8 Parents: 52aed20 2513b0f Author: MrRaindrop <tekk...@gmail.com> Authored: Tue Sep 26 11:09:30 2017 +0800 Committer: MrRaindrop <tekk...@gmail.com> Committed: Tue Sep 26 11:09:30 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 52 +- POSSIBLE-NOTICES-FOR-BIN-DIST | 5 +- WeexSDK.podspec | 2 - android/build.gradle | 13 +- android/gradle.properties | 5 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/jacoco.gradle | 43 + .../alibaba/weex/benchmark/BenchmarkTest.java | 29 +- .../playground/app/src/main/AndroidManifest.xml | 8 + .../alibaba/weex/util/CoverageDataDumper.java | 36 + .../alibaba/weex/util/JacocoCodeCoverage.java | 93 + android/sdk/libs/armeabi/libweexjsb.so | Bin 0 -> 22556 bytes android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 325660 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 0 -> 6754016 bytes .../java/com/taobao/weex/WXEnvironment.java | 16 + .../main/java/com/taobao/weex/WXSDKEngine.java | 5 + .../java/com/taobao/weex/WXSDKInstance.java | 122 +- .../weex/appfram/pickers/DatePickerImpl.java | 3 +- .../appfram/websocket/WebSocketCloseCodes.java | 2 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 79 +- .../java/com/taobao/weex/bridge/WXParams.java | 9 + .../java/com/taobao/weex/common/Constants.java | 31 + .../java/com/taobao/weex/common/WXConfig.java | 1 + .../com/taobao/weex/dom/ImmutableDomObject.java | 21 +- .../main/java/com/taobao/weex/dom/WXAttr.java | 147 +- .../com/taobao/weex/dom/WXCellDomObject.java | 53 +- .../java/com/taobao/weex/dom/WXDomObject.java | 26 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 120 +- .../taobao/weex/dom/WXRecyclerDomObject.java | 58 +- .../main/java/com/taobao/weex/dom/WXStyle.java | 17 - .../com/taobao/weex/dom/WXTextDomObject.java | 24 +- .../dom/action/AbstractAddElementAction.java | 12 +- .../com/taobao/weex/dom/action/Actions.java | 8 +- .../taobao/weex/dom/action/AddEventAction.java | 11 +- .../weex/dom/action/CreateBodyAction.java | 12 +- .../weex/dom/action/ReloadPageAction.java | 6 +- .../weex/dom/action/RemoveEventAction.java | 5 +- .../com/taobao/weex/dom/binding/ELUtils.java | 125 + .../taobao/weex/dom/binding/WXStatement.java | 160 + .../com/taobao/weex/el/parse/ArrayStack.java | 75 + .../java/com/taobao/weex/el/parse/Block.java | 75 + .../java/com/taobao/weex/el/parse/Operator.java | 106 + .../com/taobao/weex/el/parse/Operators.java | 499 + .../java/com/taobao/weex/el/parse/Parser.java | 485 + .../java/com/taobao/weex/el/parse/Symbol.java | 37 + .../java/com/taobao/weex/el/parse/Token.java | 89 + .../weex/ui/component/AppearanceHelper.java | 9 + .../weex/ui/component/WXBasicComponentType.java | 3 + .../taobao/weex/ui/component/WXComponent.java | 299 +- .../com/taobao/weex/ui/component/WXDiv.java | 74 +- .../com/taobao/weex/ui/component/WXHeader.java | 4 +- .../com/taobao/weex/ui/component/WXImage.java | 7 + .../com/taobao/weex/ui/component/WXLoading.java | 5 +- .../com/taobao/weex/ui/component/WXRefresh.java | 5 +- .../com/taobao/weex/ui/component/WXSlider.java | 4 +- .../com/taobao/weex/ui/component/WXText.java | 65 +- .../taobao/weex/ui/component/WXVContainer.java | 44 +- .../weex/ui/component/binding/Layouts.java | 92 + .../weex/ui/component/binding/Statements.java | 420 + .../ui/component/list/RecyclerTransform.java | 90 + .../taobao/weex/ui/component/list/WXCell.java | 65 +- .../weex/ui/component/list/WXListComponent.java | 53 +- .../list/template/CellLifecycleManager.java | 211 + .../list/template/TemplateStickyHelper.java | 252 + .../list/template/TemplateViewHolder.java | 79 + .../list/template/WXRecyclerTemplateList.java | 1463 + .../com/taobao/weex/ui/flat/FlatComponent.java | 33 + .../com/taobao/weex/ui/flat/FlatGUIContext.java | 146 + .../taobao/weex/ui/flat/WidgetContainer.java | 93 + .../weex/ui/flat/widget/AndroidViewWidget.java | 76 + .../taobao/weex/ui/flat/widget/BaseWidget.java | 130 + .../taobao/weex/ui/flat/widget/TextWidget.java | 49 + .../com/taobao/weex/ui/flat/widget/Widget.java | 51 + .../taobao/weex/ui/flat/widget/WidgetGroup.java | 54 + .../taobao/weex/ui/module/WXTimerModule.java | 9 +- .../weex/ui/view/WXBaseCircleIndicator.java | 131 +- .../com/taobao/weex/ui/view/WXFrameLayout.java | 53 +- .../weex/ui/view/border/BorderCorner.java | 37 +- .../taobao/weex/ui/view/border/BorderUtil.java | 26 - .../weex/ui/view/border/BottomLeftCorner.java | 7 +- .../weex/ui/view/border/BottomRightCorner.java | 7 +- .../weex/ui/view/border/TopLeftCorner.java | 7 +- .../weex/ui/view/border/TopRightCorner.java | 7 +- .../listview/ExtendedLinearLayoutManager.java | 20 + .../weex/ui/view/listview/WXRecyclerView.java | 50 + .../com/taobao/weex/utils/BoxShadowUtil.java | 510 + .../com/taobao/weex/utils/FunctionParser.java | 6 - .../java/com/taobao/weex/utils/LogLevel.java | 4 +- .../java/com/taobao/weex/utils/OsVersion.java | 2 +- .../main/java/com/taobao/weex/utils/Trace.java | 4 +- .../java/com/taobao/weex/utils/WXLogUtils.java | 14 + .../com/taobao/weex/utils/WXResourceUtils.java | 4 + .../java/com/taobao/weex/utils/WXUtils.java | 21 + .../java/com/taobao/weex/utils/WXViewUtils.java | 31 + .../com/taobao/weex/el/IfStatementTest.java | 155 + .../java/com/taobao/weex/el/ParserTest.java | 244 + .../com/taobao/weex/ui/component/WXDivTest.java | 12 +- .../taobao/weex/ui/component/WXTextTest.java | 18 +- .../ui/component/binding/BindingValueTest.java | 65 + .../ui/component/binding/StatementTest.java | 184 + .../ui/component/list/WXListComponentTest.java | 3 +- .../weex/ui/module/WXTimerModuleTest.java | 45 +- build/config.js | 3 +- dangerfile-android.js | 108 + dangerfile-ios.js | 107 + dangerfile-jsfm.js | 105 + dangerfile.js | 6 +- doc/source/cn/guide/index.md | 9 +- doc/source/cn/guide/set-up-env.md | 68 +- doc/source/cn/guide/tools/toolkit.md | 2 +- .../cn/references/advanced/extend-to-android.md | 21 +- doc/source/cn/references/common-style.md | 1 + doc/source/cn/references/components/text.md | 6 +- doc/source/cn/references/modules/animation.md | 7 +- doc/source/cn/references/modules/dom.md | 2 +- doc/source/cn/references/weex-variable.md | 48 + doc/source/guide/index.md | 4 +- doc/source/guide/set-up-env.md | 62 +- doc/source/guide/tools/toolkit.md | 5 +- doc/source/references/common-style.md | 1 + doc/source/references/components/text.md | 8 +- doc/source/references/modules/animation.md | 9 +- doc/source/references/modules/dom.md | 2 +- doc/source/references/weex-variable.md | 52 +- html5/render/vue/components/input.js | 2 +- html5/runtime/index.js | 4 +- html5/runtime/vdom/Document.js | 15 +- html5/runtime/vdom/Element.js | 45 +- html5/test/unit/default/vm/events.js | 4 +- html5/test/unit/default/vm/vm.js | 2 +- html5/test/unit/runtime/vdom/index.js | 2 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 151 +- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 4 +- .../Sources/Bridge/WXDebugLoggerBridge.h | 26 - .../Sources/Bridge/WXDebugLoggerBridge.m | 213 - ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 91 +- .../Component/RecycleList/WXCellSlotComponent.h | 32 + .../Component/RecycleList/WXCellSlotComponent.m | 93 + .../RecycleList/WXComponent+DataBinding.h | 31 + .../RecycleList/WXComponent+DataBinding.mm | 458 + .../Component/RecycleList/WXJSASTParser.h | 100 + .../Component/RecycleList/WXJSASTParser.mm | 919 + .../RecycleList/WXRecycleListComponent.h | 25 + .../RecycleList/WXRecycleListComponent.m | 459 + .../RecycleList/WXRecycleListDataManager.h | 34 + .../RecycleList/WXRecycleListDataManager.m | 71 + .../Component/RecycleList/WXRecycleListLayout.h | 32 + .../Component/RecycleList/WXRecycleListLayout.m | 113 + .../RecycleList/WXRecycleListTemplateManager.h | 33 + .../RecycleList/WXRecycleListTemplateManager.m | 94 + .../RecycleList/WXRecycleListUpdateManager.h | 51 + .../RecycleList/WXRecycleListUpdateManager.m | 262 + .../Component/Recycler/WXMultiColumnLayout.m | 32 +- .../Recycler/WXSectionDataController.m | 2 +- .../WeexSDK/Sources/Component/WXCellComponent.m | 4 +- .../Sources/Component/WXComponent_internal.h | 31 +- .../Sources/Component/WXImageComponent.m | 42 +- .../WeexSDK/Sources/Component/WXListComponent.m | 4 + .../Sources/Component/WXScrollerComponent.h | 2 + .../Sources/Component/WXScrollerComponent.m | 13 +- .../WeexSDK/Sources/Component/WXTextComponent.m | 14 +- .../WeexSDK/Sources/Component/WXWebComponent.m | 1 + .../Sources/Display/WXComponent+Display.m | 16 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 8 +- .../WeexSDK/Sources/Events/WXComponent+Events.m | 40 +- .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 4 +- .../WeexSDK/Sources/Manager/WXBridgeManager.h | 13 +- .../WeexSDK/Sources/Manager/WXBridgeManager.m | 10 + .../Sources/Manager/WXComponentFactory.h | 12 + .../Sources/Manager/WXComponentFactory.m | 30 +- .../Sources/Manager/WXComponentManager.h | 13 +- .../Sources/Manager/WXComponentManager.m | 149 +- .../WeexSDK/Sources/Manager/WXTracingManager.h | 5 + .../WeexSDK/Sources/Manager/WXTracingManager.m | 11 + ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 19 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 178 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 12 + .../WeexSDK/Sources/Module/WXAnimationModule.m | 26 +- .../WeexSDK/Sources/Module/WXModalUIModule.m | 4 +- .../WeexSDK/Sources/Module/WXPrerenderManager.m | 50 +- ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 16 + ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 24 + .../WeexSDK/Sources/Module/WXWebSocketModule.m | 1 - ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.h | 1 + ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 1 + .../Sources/Protocol/WXAppMonitorProtocol.h | 1 + ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 24 +- ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 + ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h | 23 +- ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m | 86 +- ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 15 +- ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 20 +- ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 4 + .../Sources/View/WXComponent+ViewManagement.m | 4 + .../Sources/WebSocket/SRWebSocket+Weex.h | 29 - .../Sources/WebSocket/SRWebSocket+Weex.m | 47 - .../Sources/WebSocket/WXWebSocketDefaultImpl.h | 25 - .../Sources/WebSocket/WXWebSocketDefaultImpl.m | 121 - ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 + ios/sdk/WeexSDK/dependency/SRWebSocket.h | 135 - ios/sdk/WeexSDK/dependency/SRWebSocket.m | 1806 - package.json | 9 +- packages/weex-js-framework/index.js | 44451 +++++++++-------- packages/weex-js-framework/index.min.js | 9 +- packages/weex-js-framework/package.json | 2 +- packages/weex-js-runtime/index.js | 270 +- packages/weex-js-runtime/index.min.js | 6 +- packages/weex-js-runtime/index.min.js.gz | Bin 13215 -> 0 bytes pre-build/native-bundle-main.js | 16 +- scripts/build_from_source.sh | 2 +- scripts/generate_apache_release.sh | 2 +- start | 5 +- test/pages/components/iconfont.vue | 6 +- test/pages/modules/modal-event.vue | 2 +- test/pages/modules/picker-event.vue | 6 +- test/pages/modules/vue_timer.vue | 14 +- test/pages/modules/we_timer.we | 14 +- test/run.sh | 25 +- test/screenshot/border-android.png | Bin 158634 -> 0 bytes test/screenshot/border-ios.png | Bin 126185 -> 128088 bytes test/screenshot/compositing-ios.png | Bin 228306 -> 229534 bytes test/screenshot/image-resize-android.png | Bin 214440 -> 218804 bytes test/screenshot/image-resize-ios.png | Bin 138033 -> 138103 bytes test/scripts/components/scroll-event.test.js | 2 +- test/scripts/modules/picker-event.test.js | 4 +- 225 files changed, 34670 insertions(+), 25587 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cda836a0/build/config.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cda836a0/html5/render/vue/components/input.js ---------------------------------------------------------------------- diff --cc html5/render/vue/components/input.js index b9d403d,a3e608b..dcde6f0 --- a/html5/render/vue/components/input.js +++ b/html5/render/vue/components/input.js @@@ -19,9 -19,10 +19,9 @@@ /** * @fileOverview Input component. - * Support v-model only if vue version is large than 2.2.0 + * Support v-model only if vue version is larger than 2.2.0 */ -let extractComponentStyle, createEventMap -let extend, mapFormEvents, appendCss +let extractComponentStyle, mapFormEvents, appendCss const ID_PREFIX_PLACEHOLDER_COLOR = 'wipt_plc_' const ID_PREFIX_INPUT = 'wipt_' http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cda836a0/package.json ---------------------------------------------------------------------- diff --cc package.json index 58a3fcc,8315da2..d52a121 --- a/package.json +++ b/package.json @@@ -3,8 -3,8 +3,8 @@@ "version": "0.12.2", "subversion": { "browser": "0.5.0", - "framework": "0.21.11", + "framework": "0.22.4", - "vue-render": "0.12.3", + "vue-render": "0.12.17", "transformer": ">=0.1.5 <0.5" }, "description": "A framework for building Mobile cross-platform UI",
