Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9314f309 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9314f309 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9314f309 Branch: refs/heads/0.16-dev Commit: 9314f30904dd47ce496968dc54a6a4f18652e9b1 Parents: 901be69 cfc4393 Author: misakuo <misa...@apache.org> Authored: Mon Sep 25 11:00:50 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Mon Sep 25 11:00:50 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 13 +- WeexSDK.podspec | 2 - .../main/java/com/taobao/weex/WXSDKEngine.java | 5 + .../java/com/taobao/weex/WXSDKInstance.java | 12 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 31 +- .../java/com/taobao/weex/common/Constants.java | 30 +- .../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 +- .../com/taobao/weex/dom/WXTextDomObject.java | 13 +- .../com/taobao/weex/dom/action/Actions.java | 4 +- .../taobao/weex/dom/action/AddEventAction.java | 11 +- .../weex/dom/action/CreateBodyAction.java | 12 +- .../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 | 93 +- .../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 +- .../weex/ui/component/binding/Layouts.java | 92 + .../weex/ui/component/binding/Statements.java | 413 ++++ .../ui/component/list/RecyclerTransform.java | 90 + .../taobao/weex/ui/component/list/WXCell.java | 2 +- .../list/template/CellLifecycleManager.java | 211 ++ .../list/template/TemplateStickyHelper.java | 252 +++ .../list/template/TemplateViewHolder.java | 79 + .../list/template/WXRecyclerTemplateList.java | 1460 ++++++++++++++ .../weex/ui/view/WXBaseCircleIndicator.java | 4 +- .../listview/ExtendedLinearLayoutManager.java | 20 + .../weex/ui/view/listview/WXRecyclerView.java | 50 + .../java/com/taobao/weex/utils/WXUtils.java | 21 + .../com/taobao/weex/el/IfStatementTest.java | 155 ++ .../java/com/taobao/weex/el/ParserTest.java | 244 +++ .../ui/component/binding/BindingValueTest.java | 65 + .../ui/component/binding/StatementTest.java | 184 ++ .../ui/component/list/WXListComponentTest.java | 3 +- dangerfile-android.js | 2 +- dangerfile-ios.js | 2 +- dangerfile-jsfm.js | 2 +- dangerfile.js | 2 +- doc/source/cn/guide/index.md | 9 +- doc/source/cn/guide/set-up-env.md | 4 +- 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 | 2 + 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 | 6 +- 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 | 3 +- doc/source/references/modules/dom.md | 2 +- doc/source/references/weex-variable.md | 52 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 151 +- .../Sources/Bridge/WXDebugLoggerBridge.h | 26 - .../Sources/Bridge/WXDebugLoggerBridge.m | 213 --- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 89 +- .../Component/RecycleList/WXCellSlotComponent.h | 32 + .../Component/RecycleList/WXCellSlotComponent.m | 93 + .../RecycleList/WXComponent+DataBinding.h | 31 + .../RecycleList/WXComponent+DataBinding.mm | 451 +++++ .../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 | 50 + .../RecycleList/WXRecycleListUpdateManager.m | 262 +++ .../Recycler/WXSectionDataController.m | 2 +- .../WeexSDK/Sources/Component/WXCellComponent.m | 4 +- .../Sources/Component/WXComponent_internal.h | 28 + .../Sources/Component/WXImageComponent.m | 7 +- .../Sources/Component/WXScrollerComponent.h | 2 + .../Sources/Component/WXScrollerComponent.m | 13 +- .../WeexSDK/Sources/Component/WXWebComponent.m | 1 + .../Sources/Display/WXComponent+Display.m | 2 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 8 +- .../WeexSDK/Sources/Events/WXComponent+Events.m | 5 +- .../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 | 152 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 19 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 86 +- .../WeexSDK/Sources/Module/WXAnimationModule.m | 26 +- .../WeexSDK/Sources/Module/WXWebSocketModule.m | 1 - ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h | 23 +- ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m | 86 +- ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 20 +- .../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 | 2 +- pre-build/native-bundle-main.js | 16 +- 123 files changed, 9226 insertions(+), 2649 deletions(-) ----------------------------------------------------------------------
