Merge remote-tracking branch 'origin/0.16-dev' into 0.16-dev-template-list
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9172cdde Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9172cdde Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9172cdde Branch: refs/heads/master Commit: 9172cdde0bbd250cc4c10418454499fe893c6e8d Parents: ff0af4e 5a08279 Author: jianbai.gbj <jianbai....@alibaba-inc.com> Authored: Thu Sep 21 22:09:52 2017 +0800 Committer: jianbai.gbj <jianbai....@alibaba-inc.com> Committed: Thu Sep 21 22:09:52 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 4 - 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/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 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 109 ++- .../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 + ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 4 + .../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 | 147 ++- ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 19 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 83 ++ 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 + ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 + 55 files changed, 3438 insertions(+), 77 deletions(-) ----------------------------------------------------------------------
