* [build] merge from 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/22031bc8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/22031bc8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/22031bc8 Branch: refs/heads/0.16-dev Commit: 22031bc8fab6f7ce1d56b1908a5a2c3390a8a719 Parents: 4578162 8719cde Author: Hanks <zhanghan...@gmail.com> Authored: Fri Aug 11 17:11:05 2017 +0800 Committer: Hanks <zhanghan...@gmail.com> Committed: Fri Aug 11 17:11:05 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 8 +- android/build.gradle | 8 +- android/sdk/libs/armeabi/libweexjsc.so | Bin 7570504 -> 7570392 bytes android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12121924 bytes .../java/com/taobao/weex/bridge/WXBridge.java | 8 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 36 +- .../taobao/weex/bridge/WXValidateProcessor.java | 7 +- .../java/com/taobao/weex/common/Constants.java | 1 + .../java/com/taobao/weex/dom/WXDomObject.java | 17 +- .../com/taobao/weex/dom/WXTextDomObject.java | 91 +- .../dom/action/AbstractAddElementAction.java | 2 +- .../taobao/weex/dom/action/AnimationAction.java | 1 + .../ui/animation/CameraDistanceProperty.java | 54 + .../weex/ui/animation/WXAnimationBean.java | 86 +- .../taobao/weex/ui/component/WXComponent.java | 16 - .../java/com/taobao/weex/utils/WXViewUtils.java | 4 +- build/karma.vue.conf.js | 2 +- examples/vue/components/scroller.vue | 9 +- examples/vue/modules/picker.vue | 149 +- examples/vue/modules/websocket.vue | 22 +- html5/render/vue/README.md | 15 + html5/render/vue/components/image.js | 58 +- .../vue/components/scrollable/scroller.js | 8 +- .../render/vue/components/scrollable/style.css | 5 + html5/render/vue/config.js | 10 +- html5/render/vue/core/node.js | 27 +- html5/render/vue/lib/gesture.js | 6 + html5/render/vue/modules/dom.js | 97 +- html5/render/vue/modules/modal/toast.js | 23 +- html5/test/render/vue/core/node.js | 2 + html5/test/render/vue/modules/dom.js | 17 +- ios/.gitignore | 1 + ios/playground/Podfile | 2 +- .../WeexDemo.xcodeproj/project.pbxproj | 30 +- ios/playground/WeexDemo/AppDelegate.m | 8 +- ios/playground/WeexDemo/WXDemoViewController.m | 2 - ios/playground/WeexDemo/WXExtModule.h | 26 + ios/playground/WeexDemo/WXExtModule.m | 43 + .../WeexDemo/WXExtendCallNativeTest.h | 25 + .../WeexDemo/WXExtendCallNativeTest.m | 47 + ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 44 +- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 35 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 23 +- .../Component/Recycler/WXRecyclerComponent.m | 58 +- .../Recycler/WXRecyclerDragController.h | 52 + .../Recycler/WXRecyclerDragController.m | 208 + .../WeexSDK/Sources/Component/WXEditComponent.m | 11 +- .../Sources/Component/WXImageComponent.m | 173 +- .../Sources/Component/WXScrollerComponent.m | 3 +- .../Sources/Component/WXTextAreaComponent.m | 2 +- .../WeexSDK/Sources/Component/WXTextComponent.m | 5 +- ios/sdk/WeexSDK/Sources/Component/WXTransform.h | 1 + ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 33 +- ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.h | 4 + ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.m | 10 + ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h | 10 + ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 6 + .../WeexSDK/Sources/Loader/WXResourceLoader.m | 2 +- .../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 | 1 - ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 7 +- .../WeexSDK/Sources/Module/WXAnimationModule.m | 5 + ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 13 + .../WeexSDK/Sources/Module/WXWebSocketModule.m | 16 +- ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 9 + .../Sources/Network/WXResourceResponse.h | 2 +- .../Sources/Protocol/WXAppMonitorProtocol.h | 2 + .../Protocol/WXExtendCallNativeProtocol.h | 47 + .../Sources/Protocol/WXTracingProtocol.h | 29 + ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 + 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 | 3 + package.json | 11 +- 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 +- packages/weex-vue-render/README.md | 15 + packages/weex-vue-render/package.json | 2 +- pre-build/native-bundle-main.js | 16 +- test/pages/components/hyperlink_target.vue | 1 + test/pages/components/iconfont.vue | 71 + test/pages/components/input-event.vue | 65 + test/pages/components/refresh-loading.vue | 115 + test/pages/components/switch-event.vue | 60 + test/pages/components/web-event.vue | 56 + test/pages/include/button.vue | 162 + test/pages/include/h1.vue | 13 + test/pages/include/h2.vue | 13 + test/pages/include/h3.vue | 13 + test/pages/include/hn.vue | 47 + test/pages/include/panel.vue | 141 + test/pages/include/wxc-desc.vue | 66 + test/pages/modules/animation-translate.vue | 129 + test/pages/modules/clipboard-event.vue | 57 + test/pages/modules/cover-generate.vue | 53 + test/pages/modules/downgrade-event.vue | 74 + test/pages/modules/gesture-longpress.vue | 75 + test/pages/modules/modal-event.vue | 61 + test/pages/modules/picker-event.vue | 63 + test/pages/modules/storage-event.vue | 59 + test/pages/modules/stream-result.vue | 85 + test/run.sh | 30 +- test/screenshot/border-android.png | Bin 156247 -> 158634 bytes test/scripts/components/iconfont.test.js | 34 + test/scripts/components/input-event.test.js | 36 + test/scripts/components/refresh-loading.test.js | 38 + test/scripts/components/switch-event.test.js | 38 + test/scripts/components/web-event.test.js | 30 + .../scripts/modules/animation-translate.test.js | 40 + test/scripts/modules/clipboard-event.test.js | 35 + test/scripts/modules/downgrade-event.test.js | 30 + test/scripts/modules/gesture-longpress.test.js | 37 + test/scripts/modules/modal-event.test.js | 35 + test/scripts/modules/picker-event.test.js | 41 + test/scripts/modules/storage-event.test.js | 36 + test/scripts/modules/stream-result.test.js | 34 + test/scripts/util.js | 41 + test/scripts/zcover-generate.js | 32 + test/serve.sh | 2 +- vue.html | 3 + 138 files changed, 13107 insertions(+), 8719 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/22031bc8/package.json ---------------------------------------------------------------------- diff --cc package.json index 3a84f29,70c4015..d43f65a --- a/package.json +++ b/package.json @@@ -104,10 -105,11 +105,16 @@@ "semver": "^5.1.0", "weex-picker": "^0.1.0", "weex-rax-framework": "0.4.7", ++<<<<<<< HEAD + "weex-vue-framework": "2.4.2-weex.3", + "weex-styler": "^0.2.2" ++======= + "weex-styler": "0.1.9", + "weex-vue-framework": "2.4.2-weex.3" ++>>>>>>> 0.16-dev }, "devDependencies": { + "@weex-project/weex-picker": "^0.2.4", "babel-core": "^6.17.0", "babel-eslint": "^7.2.1", "babel-istanbul": "^0.11.0",
