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/10 07:36:15 UTC
[02/12] incubator-weex git commit: Merge branch '0.16-dev' into
jsfm-feature-0.21.8
Merge branch '0.16-dev' into jsfm-feature-0.21.8
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/08033f25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/08033f25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/08033f25
Branch: refs/heads/0.16-dev
Commit: 08033f25a32b69b5c36abd7578bc4f55a2e98cc4
Parents: e3879ee 8b9845e
Author: Hanks <zh...@gmail.com>
Authored: Thu Aug 10 14:35:48 2017 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Thu Aug 10 14:35:48 2017 +0800
----------------------------------------------------------------------
.../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/dom/WXDomObject.java | 17 +-
.../dom/action/AbstractAddElementAction.java | 2 +-
build/karma.vue.conf.js | 2 +-
examples/vue/components/scroller.vue | 9 +-
examples/vue/modules/picker.vue | 149 ++++++-------
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 | 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 | 12 +-
.../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/WXTextAreaComponent.m | 2 +-
ios/sdk/WeexSDK/Sources/Component/WXTransform.h | 1 +
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 33 ++-
.../WeexSDK/Sources/Loader/WXResourceLoader.m | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 1 +
.../WeexSDK/Sources/Module/WXAnimationModule.m | 5 +
.../Sources/Network/WXResourceResponse.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
package.json | 12 +-
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 +
86 files changed, 2932 insertions(+), 331 deletions(-)
----------------------------------------------------------------------