You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/08/17 02:18:08 UTC
[2/7] incubator-weex git commit: Merge branch '0.16-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into
ios-feature-0.16-pageName
Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-0.16-pageName
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b7d1b044
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b7d1b044
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b7d1b044
Branch: refs/heads/0.16-dev
Commit: b7d1b044483c03f13a7ace06bc51839f283e71bb
Parents: 78ff963 57802c0
Author: acton393 <zh...@gmail.com>
Authored: Tue Aug 15 17:33:49 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Aug 15 17:33:49 2017 +0800
----------------------------------------------------------------------
.gitignore | 5 +-
.travis.yml | 8 +-
android/build.gradle | 8 +-
.../java/com/alibaba/weex/IndexActivity.java | 14 +
android/sdk/libs/armeabi/libweexjsc.so | Bin 7570504 -> 7570392 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12121924 bytes
.../java/com/taobao/weex/WXSDKInstance.java | 11 +-
.../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 | 3 +
.../taobao/weex/common/WXWorkThreadManager.java | 48 +
.../java/com/taobao/weex/dom/WXDomObject.java | 32 +-
.../com/taobao/weex/dom/WXTextDomObject.java | 91 +-
.../dom/action/AbstractAddElementAction.java | 2 +-
.../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 -
.../com/taobao/weex/ui/component/WXImage.java | 68 +
.../taobao/weex/ui/component/WXScroller.java | 16 +-
.../ui/component/list/BasicListComponent.java | 33 +-
.../taobao/weex/utils/WXViewToImageUtil.java | 151 +
.../java/com/taobao/weex/utils/WXViewUtils.java | 4 +-
build/build.js | 106 +-
build/config.js | 54 +-
build/karma.vue.conf.js | 2 +-
dangerfile.js | 79 +-
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 +-
entry.js | 11 +
examples/vue/components/scroller.vue | 9 +-
examples/vue/index.vue | 1 +
examples/vue/modules/picker.vue | 64 +
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 | 92 +
html5/render/vue/components/a.js | 90 +-
html5/render/vue/components/div.js | 43 +-
html5/render/vue/components/image.js | 76 +-
html5/render/vue/components/index.js | 37 +-
html5/render/vue/components/input.js | 130 +-
html5/render/vue/components/scrollable/cell.js | 39 +
.../render/vue/components/scrollable/header.js | 102 +-
html5/render/vue/components/scrollable/index.js | 48 +
html5/render/vue/components/scrollable/list.js | 82 +
.../vue/components/scrollable/list/cell.js | 36 -
.../vue/components/scrollable/list/index.js | 77 -
.../vue/components/scrollable/list/listMixin.js | 47 -
.../vue/components/scrollable/list/style.js | 34 -
.../components/scrollable/loading-indicator.js | 17 +-
.../render/vue/components/scrollable/loading.js | 141 +-
.../vue/components/scrollable/mixins/index.js | 26 +
.../vue/components/scrollable/mixins/list.js | 46 +
.../components/scrollable/mixins/scrollable.js | 267 +
.../render/vue/components/scrollable/refresh.js | 157 +-
.../vue/components/scrollable/scroller.js | 143 +-
.../render/vue/components/scrollable/style.css | 90 +
.../vue/components/scrollable/waterfall.js | 573 +-
html5/render/vue/components/slider/index.js | 52 +-
html5/render/vue/components/slider/indicator.js | 18 +-
.../render/vue/components/slider/slideMixin.js | 46 +-
.../vue/components/slider/slider-neighbor.js | 12 +-
html5/render/vue/components/slider/slider.css | 19 +
html5/render/vue/components/slider/slider.js | 75 +
html5/render/vue/components/switch.js | 114 +-
html5/render/vue/components/text.js | 52 +-
html5/render/vue/components/textarea.js | 104 +-
html5/render/vue/components/video.js | 107 +-
html5/render/vue/components/web.js | 98 +-
html5/render/vue/config.js | 10 +-
html5/render/vue/core/node.js | 27 +-
html5/render/vue/core/style.js | 35 -
html5/render/vue/env/global.js | 6 +
html5/render/vue/env/index.js | 5 -
html5/render/vue/index.js | 25 -
html5/render/vue/lib/gesture.js | 6 +
html5/render/vue/mixins/base.js | 71 -
html5/render/vue/mixins/index.js | 2 -
html5/render/vue/mixins/scrollable.js | 233 -
html5/render/vue/mixins/style.js | 4 +-
html5/render/vue/modules/animation.js | 36 +-
html5/render/vue/modules/dom.js | 96 +-
html5/render/vue/modules/globalEvent.js | 8 +-
html5/render/vue/modules/index.js | 36 +-
html5/render/vue/modules/modal/toast.js | 23 +-
html5/render/vue/modules/navigator.js | 10 +-
html5/render/vue/modules/webview.js | 18 +-
html5/render/vue/styles/base.css | 86 +-
html5/render/vue/styles/reset.css | 19 +
html5/render/vue/utils/lazyload.js | 24 +-
html5/render/vue/utils/perf.js | 283 +-
html5/runtime/callback-manager.js | 12 +-
html5/runtime/config.js | 5 +-
html5/runtime/normalize.js | 98 +
html5/runtime/task-center.js | 59 +-
html5/runtime/vdom/document.js | 2 +
html5/runtime/vdom/element.js | 15 +-
html5/test/render/vue/components/list.js | 2 +-
html5/test/render/vue/components/switch.js | 5 +-
html5/test/render/vue/core/node.js | 2 +
html5/test/render/vue/examples/list-cell.js | 2 +-
html5/test/render/vue/helper/index.js | 2 +-
html5/test/render/vue/helper/main.js | 3 +-
html5/test/render/vue/helper/utils.js | 4 +
html5/test/render/vue/modules/animation.js | 12 +-
html5/test/render/vue/modules/dom.js | 27 +-
html5/test/render/vue/modules/globalEvent.js | 8 +-
html5/test/render/vue/modules/navigator.js | 8 +-
html5/test/render/vue/modules/webview.js | 10 +-
html5/test/render/vue/utils/lazyload.js | 59 +-
html5/test/render/vue/utils/perf.js | 94 +-
html5/test/render/vue/utils/style.js | 50 +-
ios/.gitignore | 1 +
ios/playground/Podfile | 2 +-
.../WeexDemo.xcodeproj/project.pbxproj | 30 +-
ios/playground/WeexDemo/AppDelegate.m | 8 +-
ios/playground/WeexDemo/Info.plist | 4 +
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 | 72 +-
.../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/WXAComponent.m | 1 +
.../Sources/Component/WXComponent_internal.h | 12 +
.../WeexSDK/Sources/Component/WXEditComponent.m | 11 +-
.../Sources/Component/WXImageComponent.m | 239 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 4 +-
.../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 +
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/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 +
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 1 +
.../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 | 7 +-
.../WeexSDK/Sources/Module/WXAnimationLayout.h | 49 -
.../WeexSDK/Sources/Module/WXAnimationLayout.m | 115 -
.../WeexSDK/Sources/Module/WXAnimationModule.h | 2 +
.../WeexSDK/Sources/Module/WXAnimationModule.m | 93 +-
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 14 +
ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 43 +
ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 311 +
.../WeexSDK/Sources/Module/WXWebSocketModule.h | 1 -
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 17 +-
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 +
.../Sources/Protocol/WXURLRewriteProtocol.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 3 +-
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 | 35 +-
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-plugins/weex-vue-a/README.md | 3 +
.../weex-vue-plugins/weex-vue-a/package.json | 26 +
.../weex-vue-plugins/weex-vue-a/src/index.js | 2 +
.../weex-vue-animation/README.md | 3 +
.../weex-vue-animation/package.json | 27 +
.../weex-vue-animation/src/index.js | 2 +
.../weex-vue-clipboard/README.md | 3 +
.../weex-vue-clipboard/package.json | 27 +
.../weex-vue-clipboard/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-dom/README.md | 3 +
.../weex-vue-plugins/weex-vue-dom/package.json | 27 +
.../weex-vue-plugins/weex-vue-dom/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-event/README.md | 3 +
.../weex-vue-event/package.json | 27 +
.../weex-vue-event/src/index.js | 2 +
.../weex-vue-geolocation/README.md | 3 +
.../weex-vue-geolocation/package.json | 27 +
.../weex-vue-geolocation/src/index.js | 2 +
.../weex-vue-global-event/README.md | 3 +
.../weex-vue-global-event/package.json | 27 +
.../weex-vue-global-event/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-input/README.md | 3 +
.../weex-vue-input/package.json | 26 +
.../weex-vue-input/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-modal/README.md | 3 +
.../weex-vue-modal/package.json | 27 +
.../weex-vue-modal/src/index.js | 2 +
.../weex-vue-navigator/README.md | 3 +
.../weex-vue-navigator/package.json | 27 +
.../weex-vue-navigator/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-slider/README.md | 3 +
.../weex-vue-slider/package.json | 27 +
.../weex-vue-slider/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-storage/README.md | 3 +
.../weex-vue-storage/package.json | 27 +
.../weex-vue-storage/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-stream/README.md | 3 +
.../weex-vue-stream/package.json | 27 +
.../weex-vue-stream/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-switch/README.md | 3 +
.../weex-vue-switch/package.json | 26 +
.../weex-vue-switch/src/index.js | 2 +
.../weex-vue-textarea/.DS_Store | Bin 0 -> 6148 bytes
.../weex-vue-textarea/README.md | 3 +
.../weex-vue-textarea/package.json | 26 +
.../weex-vue-textarea/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-video/README.md | 3 +
.../weex-vue-video/package.json | 26 +
.../weex-vue-video/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-web/README.md | 3 +
.../weex-vue-plugins/weex-vue-web/package.json | 26 +
.../weex-vue-plugins/weex-vue-web/src/index.js | 2 +
.../weex-vue-websocket/README.md | 3 +
.../weex-vue-websocket/package.json | 27 +
.../weex-vue-websocket/src/index.js | 2 +
.../weex-vue-plugins/weex-vue-webview/README.md | 3 +
.../weex-vue-webview/package.json | 27 +
.../weex-vue-webview/src/index.js | 2 +
packages/weex-vue-render/README.md | 92 +
packages/weex-vue-render/package.json | 9 +-
packages/weex-vue-render/src/index.core.js | 13 +
packages/weex-vue-render/src/index.js | 12 +
pre-build/native-bundle-main.js | 16 +-
scripts/commit-msg.sh | 2 +-
scripts/dist-vue.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/image-onload.vue | 14 +-
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 | 24 +-
test/screenshot/border-android.png | Bin 156247 -> 158634 bytes
test/scripts/components/iconfont.test.js | 34 +
test/scripts/components/image-onload.test.js | 10 +
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 | 11 +-
332 files changed, 44178 insertions(+), 2926 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b7d1b044/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
----------------------------------------------------------------------