You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/08/09 06:50:25 UTC
[3/6] incubator-weex git commit: Merge branch '0.16-dev' of
https://github.com/apache/incubator-weex into dev_recycle_drag
Merge branch '0.16-dev' of https://github.com/apache/incubator-weex into dev_recycle_drag
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/62c12709
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/62c12709
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/62c12709
Branch: refs/heads/0.16-dev
Commit: 62c12709c603f34ee6cf43381d60712fad02b521
Parents: 8241639 5951404
Author: ximu <xi...@alibaba-inc.com>
Authored: Tue Aug 1 10:58:54 2017 +0800
Committer: ximu <xi...@alibaba-inc.com>
Committed: Tue Aug 1 10:58:54 2017 +0800
----------------------------------------------------------------------
.gitignore | 3 +
WeexSDK.podspec | 2 +-
.../java/com/taobao/weex/WXSDKInstance.java | 11 +-
.../ui/component/list/BasicListComponent.java | 15 +-
build/build.js | 105 +++-
build/config.js | 37 +-
dangerfile.js | 87 ++-
entry.js | 11 +
examples/vue/index.vue | 1 +
examples/vue/modules/picker.vue | 97 ++++
html5/render/vue/README.md | 77 +++
html5/render/vue/components/a.js | 90 +--
html5/render/vue/components/div.js | 43 +-
html5/render/vue/components/image.js | 18 +-
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 | 135 +++--
.../render/vue/components/scrollable/style.css | 85 +++
.../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/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/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 | 21 +-
html5/render/vue/modules/globalEvent.js | 8 +-
html5/render/vue/modules/index.js | 36 +-
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/test/render/vue/components/list.js | 2 +-
html5/test/render/vue/components/switch.js | 5 +-
html5/test/render/vue/core/node.js | 5 +-
.../render/vue/data/dotvue/event-bubble-bar.vue | 8 +-
.../render/vue/data/dotvue/event-bubble.vue | 4 +-
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 | 61 ++
html5/test/render/vue/modules/dom.js | 111 ++++
html5/test/render/vue/modules/globalEvent.js | 47 ++
html5/test/render/vue/modules/navigator.js | 46 ++
html5/test/render/vue/modules/webview.js | 55 ++
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/playground/Podfile | 2 +-
ios/playground/WeexDemo/Info.plist | 4 +
ios/playground/WeexDemo/WXDemoViewController.m | 1 -
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 6 +-
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 27 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 14 +
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.h | 2 +
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 11 +-
.../Sources/Component/WXImageComponent.m | 89 ++-
.../WeexSDK/Sources/Component/WXListComponent.m | 2 +-
.../Sources/Manager/WXComponentManager.m | 14 +-
.../WeexSDK/Sources/Manager/WXTracingManager.h | 35 +-
.../WeexSDK/Sources/Manager/WXTracingManager.m | 18 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +-
.../WeexSDK/Sources/Module/WXWebSocketModule.h | 1 -
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 1 +
.../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 5 +
.../Sources/Protocol/WXValidateProtocol.h | 4 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 9 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 +-
package.json | 19 +-
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 | 77 +++
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 | 12 +-
scripts/dist-vue.sh | 2 +-
test/pages/image-onload.vue | 14 +-
test/scripts/components/image-onload.test.js | 10 +
vue.html | 8 +-
168 files changed, 3639 insertions(+), 2247 deletions(-)
----------------------------------------------------------------------