Merge remote-tracking branch 'upstream/pr586' into apache-0.16-dev # Conflicts: # android/sdk/libs/x86/libweexjsc.so
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/20741567 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/20741567 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/20741567 Branch: refs/heads/0.16-dev Commit: 20741567969ef7910df7492b7ac6319318c6613c Parents: 71b0792 57802c0 Author: misakuo <misa...@apache.org> Authored: Tue Aug 15 17:32:22 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Tue Aug 15 17:32:22 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 8 +- android/build.gradle | 8 +- android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12121924 bytes .../java/com/taobao/weex/common/Constants.java | 3 + .../java/com/taobao/weex/dom/WXDomObject.java | 15 +- .../com/taobao/weex/dom/WXTextDomObject.java | 91 +- .../taobao/weex/dom/action/AnimationAction.java | 1 + .../weex/dom/action/GetComponentRectAction.java | 12 + .../ui/animation/CameraDistanceProperty.java | 54 + .../weex/ui/animation/WXAnimationBean.java | 86 +- .../ui/component/AbstractEditComponent.java | 2 +- .../weex/ui/component/ContentMeasurable.java | 29 + .../taobao/weex/ui/component/WXComponent.java | 16 - .../taobao/weex/ui/component/WXScroller.java | 16 +- .../com/taobao/weex/ui/component/WXSlider.java | 4 +- .../ui/component/list/BasicListComponent.java | 18 +- .../java/com/taobao/weex/utils/WXViewUtils.java | 4 +- doc/source/_posts/arkit.md | 112 + doc/source/_posts/cn/hello.md | 6 - doc/source/_posts/hello_world.md | 7 - doc/source/_posts/test.md | 14 - doc/source/cn/blog/index.md | 4 - .../cn/references/advanced/extend-to-ios.md | 4 +- .../advanced/integrate-devtool-to-android.md | 86 +- doc/source/cn/references/common-style.md | 2 + doc/source/cn/references/components/text.md | 4 +- doc/source/cn/references/modules/animation.md | 2 +- doc/source/references/advanced/extend-to-ios.md | 5 +- doc/source/references/common-style.md | 2 + doc/source/references/components/text.md | 4 +- doc/source/references/modules/animation.md | 2 +- doc/themes/weex/layout/_partial/header.ejs | 1 + .../weex/layout/_partial/post/summary.ejs | 1 + doc/themes/weex/source/css/blog.scss | 3 + doc/themes/weex/source/css/media-queries.scss | 1 + doc/themes/weex/source/css/partial/header.scss | 6 +- examples/vue/modules/websocket.vue | 22 +- html5/runtime/normalize.js | 13 +- html5/runtime/task-center.js | 6 +- .../WeexDemo.xcodeproj/project.pbxproj | 6 + ios/playground/WeexDemo/AppDelegate.m | 2 +- .../WeexDemo/WXExtendCallNativeTest.h | 25 + .../WeexDemo/WXExtendCallNativeTest.m | 47 + ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 56 +- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 35 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 23 +- .../Sources/Component/WXComponent_internal.h | 12 + .../WeexSDK/Sources/Component/WXListComponent.m | 4 +- .../Sources/Component/WXScrollerComponent.m | 3 +- .../WeexSDK/Sources/Component/WXTextComponent.m | 5 +- ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.h | 4 + ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.m | 10 + .../Sources/Display/WXComponent+Display.m | 16 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h | 10 + ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 6 + .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 3 +- .../WeexSDK/Sources/Loader/WXWebSocketLoader.h | 2 +- .../WeexSDK/Sources/Loader/WXWebSocketLoader.m | 2 +- .../WeexSDK/Sources/Manager/WXBridgeManager.m | 4 + .../Sources/Manager/WXComponentFactory.h | 1 + .../Sources/Manager/WXComponentFactory.m | 23 + .../Sources/Manager/WXComponentManager.m | 18 +- .../Sources/Manager/WXExtendCallNativeManager.h | 26 + .../Sources/Manager/WXExtendCallNativeManager.m | 80 + .../WeexSDK/Sources/Manager/WXModuleFactory.h | 6 + .../WeexSDK/Sources/Manager/WXModuleFactory.m | 24 + .../WeexSDK/Sources/Manager/WXTracingManager.h | 33 +- .../WeexSDK/Sources/Manager/WXTracingManager.m | 169 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 68 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +- .../WeexSDK/Sources/Module/WXAnimationLayout.h | 49 - .../WeexSDK/Sources/Module/WXAnimationLayout.m | 115 - .../WeexSDK/Sources/Module/WXAnimationModule.h | 2 + .../WeexSDK/Sources/Module/WXAnimationModule.m | 88 +- ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 13 + ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 43 + ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 311 + .../WeexSDK/Sources/Module/WXWebSocketModule.m | 16 +- ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 9 + .../Sources/Protocol/WXAppMonitorProtocol.h | 2 + .../Protocol/WXExtendCallNativeProtocol.h | 47 + .../Sources/Protocol/WXTracingProtocol.h | 29 + ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 3 +- ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 12 + ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 22 + .../Sources/View/WXComponent+ViewManagement.m | 1 - .../Sources/WebSocket/WXWebSocketDefaultImpl.m | 2 +- ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 + package.json | 4 +- packages/weex-js-framework/index.js | 16073 +++++++++-------- packages/weex-js-framework/index.min.js | 2 +- packages/weex-js-framework/package.json | 2 +- packages/weex-js-runtime/index.js | 1436 +- packages/weex-js-runtime/index.min.js | 2 +- packages/weex-js-runtime/index.min.js.gz | Bin 12588 -> 13215 bytes packages/weex-js-runtime/package.json | 2 +- pre-build/native-bundle-main.js | 16 +- test/run.sh | 18 +- 98 files changed, 11020 insertions(+), 8704 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/20741567/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/20741567/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/20741567/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java ----------------------------------------------------------------------