Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-tracing-0.15-dev
# Conflicts: # ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cfa61185 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cfa61185 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cfa61185 Branch: refs/heads/0.16-dev Commit: cfa61185e3b68c6bd7a5d4a38de0da3d3a9dda2e Parents: 898b8a2 33a6bec Author: é½å±± <[email protected]> Authored: Fri Jul 21 18:05:21 2017 +0800 Committer: é½å±± <[email protected]> Committed: Fri Jul 21 18:05:21 2017 +0800 ---------------------------------------------------------------------- README.md | 51 +- .../weex/extend/component/WXParallax.java | 4 +- .../java/com/taobao/weex/WXEnvironment.java | 4 + .../com/taobao/weex/bridge/WXBridgeManager.java | 12 +- .../java/com/taobao/weex/common/WXConfig.java | 1 + .../java/com/taobao/weex/dom/WXDomModule.java | 1 - .../com/taobao/weex/dom/WXTextDomObject.java | 4 +- .../com/taobao/weex/dom/action/Actions.java | 4 +- .../taobao/weex/ui/component/WXComponent.java | 8 + .../taobao/weex/ui/component/WXScroller.java | 79 ++- .../com/taobao/weex/ui/component/WXSlider.java | 10 +- .../ui/component/list/BasicListComponent.java | 73 ++- .../taobao/weex/ui/component/list/WXCell.java | 1 - .../weex/ui/view/WXHorizontalScrollView.java | 27 + .../com/taobao/weex/ui/view/WXScrollView.java | 1 - build/config.js | 1 + build/karma.vue.conf.js | 16 +- doc/source/cn/references/modules/meta.md | 96 +++ doc/source/cn/references/modules/timer.md | 47 ++ doc/source/cn/references/weex-variable.md | 1 + doc/source/references/modules/meta.md | 97 +++ doc/source/references/modules/timer.md | 58 ++ doc/source/references/weex-variable.md | 1 + examples/vue/hello.vue | 2 +- .../vue/components/scrollable/list/index.js | 3 +- .../vue/components/scrollable/scroller.js | 3 +- .../vue/components/scrollable/waterfall.js | 3 +- .../render/vue/components/slider/slideMixin.js | 17 +- html5/render/vue/core/node.js | 172 +++-- html5/render/vue/core/style.js | 1 - html5/render/vue/env/wx-env.js | 2 +- html5/render/vue/mixins/base.js | 16 +- html5/render/vue/mixins/scrollable.js | 18 +- html5/render/vue/modules/websocket/websocket.js | 2 + html5/render/vue/utils/event.js | 6 +- html5/render/vue/utils/func.js | 136 +++- html5/render/vue/utils/index.js | 104 --- html5/render/vue/utils/perf.js | 3 +- html5/render/vue/utils/style.js | 30 +- html5/test/render/vue/core/node.js | 22 +- html5/test/render/vue/helper/utils.js | 10 +- html5/test/render/vue/modules/modal.js | 225 +++++++ html5/test/render/vue/modules/websocket.js | 83 ++- html5/test/render/vue/utils/component.js | 50 +- html5/test/render/vue/utils/event.js | 78 +++ html5/test/render/vue/utils/func.js | 278 +++++++- html5/test/render/vue/utils/lazyload.js | 106 ++++ html5/test/render/vue/utils/perf.js | 132 ++++ html5/test/render/vue/utils/style.js | 157 ++++- html5/test/render/vue/utils/type.js | 49 ++ html5/test/render/vue/validator/index.js | 31 +- ios/sdk/WeexSDK-Dynamic/Info.plist | 24 + ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 630 ++++++++++++++++++- .../xcschemes/WeexSDK-Dynamic.xcscheme | 80 +++ .../WeexSDK/Sources/Bridge/WXBridgeContext.h | 2 +- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 40 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +- .../Component/Recycler/WXRecyclerComponent.h | 3 +- .../Component/Recycler/WXRecyclerComponent.m | 5 +- .../Recycler/WXSectionDataController.h | 2 + .../WeexSDK/Sources/Component/WXAComponent.m | 2 +- .../Sources/Component/WXCanvasComponent.h | 2 +- .../Sources/Component/WXCycleSliderComponent.m | 6 + .../WeexSDK/Sources/Component/WXEditComponent.m | 2 +- .../Sources/Component/WXFooterComponent.h | 2 +- .../Sources/Component/WXHeaderComponent.h | 3 +- .../Sources/Component/WXImageComponent.m | 4 +- .../WeexSDK/Sources/Component/WXListComponent.m | 57 +- .../WeexSDK/Sources/Component/WXTextComponent.m | 60 +- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 24 +- .../Sources/Component/WXVideoComponent.m | 2 +- .../WeexSDK/Sources/Component/WXWebComponent.m | 2 +- .../Sources/Controller/WXRootViewController.m | 1 + .../Sources/Display/WXComponent+BoxShadow.h | 4 - ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.h | 1 + ios/sdk/WeexSDK/Sources/Display/WXRoundedRect.h | 2 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 10 +- .../Sources/Handler/WXURLRewriteDefaultImpl.m | 2 +- .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 3 +- .../Sources/Manager/WXComponentManager.h | 3 + .../Sources/Manager/WXComponentManager.m | 1 + ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 2 +- .../WeexSDK/Sources/Manager/WXServiceFactory.h | 2 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +- .../WeexSDK/Sources/Model/WXJSExceptionInfo.m | 1 + ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +- .../WeexSDK/Sources/Module/WXAnimationModule.m | 14 +- ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 8 +- ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 11 +- ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +- .../Sources/Protocol/WXURLRewriteProtocol.h | 2 +- ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 1 + .../View/WXComponent+PseudoClassManagement.h | 4 +- .../Sources/View/WXComponent+ViewManagement.m | 4 + ios/sdk/WeexSDKTests/WXAnimationModuleTests.m | 29 + ios/sdk/buildScripts.sh | 2 + package.json | 4 +- packages/weex-vue-render/package.json | 8 +- pre-build/native-bundle-main.js | 16 +- 99 files changed, 2929 insertions(+), 506 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfa61185/ios/sdk/WeexSDK.xcodeproj/project.pbxproj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfa61185/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfa61185/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfa61185/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfa61185/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfa61185/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m ---------------------------------------------------------------------- diff --cc ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m index 9fce3a4,cfb37b2..ea2d4a8 --- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m +++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m @@@ -34,7 -34,7 +34,8 @@@ #import "WXHandlerFactory.h" #import "WXValidateProtocol.h" #import "WXPrerenderManager.h" +#import "WXTracingManager.h" + #import "WXLayoutDefine.h" static NSThread *WXComponentThread; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfa61185/ios/sdk/WeexSDK/Sources/Model/WXComponent.m ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfa61185/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfa61185/ios/sdk/WeexSDK/Sources/Module/WXDomModule.m ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfa61185/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m ----------------------------------------------------------------------
