Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-devtools-tracing-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/d1bdd73b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d1bdd73b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d1bdd73b Branch: refs/heads/0.16-dev Commit: d1bdd73bcee036433f9e50c8566ddb2a4bf347ff Parents: 2a1bcba 63c9c86 Author: é½å±± <sunjjb...@163.com> Authored: Thu Aug 10 19:58:25 2017 +0800 Committer: é½å±± <sunjjb...@163.com> Committed: Thu Aug 10 19:58:25 2017 +0800 ---------------------------------------------------------------------- .gitignore | 2 +- .travis.yml | 8 +- android/build.gradle | 8 +- .../java/com/alibaba/weex/IndexActivity.java | 14 + .../main/java/com/taobao/weex/WXSDKManager.java | 10 + .../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 + .../taobao/weex/common/WXWorkThreadManager.java | 48 + .../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 - .../com/taobao/weex/ui/component/WXImage.java | 68 + .../taobao/weex/utils/WXViewToImageUtil.java | 151 + .../java/com/taobao/weex/utils/WXViewUtils.java | 4 +- build/build.js | 1 + build/config.js | 17 +- 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/frameworks/legacy/core/array.js | 4 + html5/frameworks/legacy/core/object.js | 6 + html5/frameworks/legacy/static/create.js | 7 +- html5/frameworks/legacy/vm/directive.js | 6 + html5/frameworks/vanilla/index.js | 35 +- 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/runtime/callback-manager.js | 12 +- html5/runtime/config.js | 5 +- html5/runtime/normalize.js | 107 + html5/runtime/task-center.js | 59 +- html5/runtime/vdom/document.js | 2 + html5/runtime/vdom/element.js | 15 +- 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 | 24 +- ios/playground/WeexDemo/AppDelegate.m | 8 +- ios/playground/WeexDemo/WXDemoViewController.m | 2 - ios/playground/WeexDemo/WXExtModule.h | 26 + ios/playground/WeexDemo/WXExtModule.m | 43 + ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 16 +- .../Component/Recycler/WXRecyclerComponent.m | 58 +- .../Recycler/WXRecyclerDragController.h | 52 + .../Recycler/WXRecyclerDragController.m | 208 + .../WeexSDK/Sources/Component/WXAComponent.m | 1 + .../WeexSDK/Sources/Component/WXEditComponent.m | 11 +- .../Sources/Component/WXImageComponent.m | 174 +- .../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 +- .../Sources/Component/WXVideoComponent.m | 1 + .../WeexSDK/Sources/Component/WXWebComponent.m | 1 + .../WeexSDK/Sources/Loader/WXResourceLoader.m | 2 +- .../WeexSDK/Sources/Loader/WXWebSocketLoader.h | 2 +- .../WeexSDK/Sources/Loader/WXWebSocketLoader.m | 2 +- ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 1 + ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 1 + .../WeexSDK/Sources/Module/WXAnimationModule.m | 5 + ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 14 + .../WeexSDK/Sources/Module/WXWebSocketModule.m | 16 +- ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 7 + .../Sources/Network/WXResourceResponse.h | 2 +- .../Sources/Protocol/WXAppMonitorProtocol.h | 2 + .../Sources/Protocol/WXURLRewriteProtocol.h | 2 +- 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/WebSocket/WXWebSocketDefaultImpl.m | 2 +- ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 + package.json | 18 +- packages/weex-js-framework/.npmignore | 4 + packages/weex-js-framework/index.js | 26001 +++++++++++++++++ packages/weex-js-framework/index.min.js | 1 + packages/weex-js-framework/package.json | 22 + packages/weex-js-runtime/.npmignore | 4 + packages/weex-js-runtime/index.js | 4088 +++ packages/weex-js-runtime/index.min.js | 1 + packages/weex-js-runtime/index.min.js.gz | Bin 0 -> 13215 bytes packages/weex-js-runtime/package.json | 22 + packages/weex-legacy-framework/.npmignore | 4 + packages/weex-legacy-framework/index.js | 5770 ++++ packages/weex-legacy-framework/index.min.js | 1 + packages/weex-legacy-framework/package.json | 22 + packages/weex-vue-render/README.md | 15 + packages/weex-vue-render/package.json | 2 +- pre-build/native-bundle-main.js | 16 +- scripts/commit-msg.sh | 2 +- 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 + 145 files changed, 39664 insertions(+), 505 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d1bdd73b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d1bdd73b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d1bdd73b/ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d1bdd73b/ios/sdk/WeexSDK/Sources/WeexSDK.h ----------------------------------------------------------------------
