You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/04/28 03:04:22 UTC
[14/50] [abbrv] incubator-weex git commit: Merge remote-tracking
branch 'upstream/0.12-dev' into 0.12-dev
Merge remote-tracking branch 'upstream/0.12-dev' into 0.12-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/87228bf2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/87228bf2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/87228bf2
Branch: refs/heads/master
Commit: 87228bf22fa1ece088384fa53849f7b956141e25
Parents: 5bda148 25dfede
Author: yinfeng <cx...@apache.org>
Authored: Mon Apr 24 16:17:23 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Mon Apr 24 16:17:23 2017 +0800
----------------------------------------------------------------------
.eslintrc | 3 +-
.gitignore | 3 +
.travis.yml | 7 +-
NOTICE | 96 ----
POSSIBLE-NOTICES-FOR-BIN-DIST | 96 ++++
WeexSDK.podspec | 1 +
android/sdk/libs/armeabi/libweexjsc.so | Bin 7816288 -> 7815820 bytes
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 2 +-
bin/dist-vue.sh | 21 +-
build/webpack.test.web.config.js | 2 +-
examples/vue/showcase/gesture.vue | 57 ++
html5/render/vue/components/index.js | 8 +-
.../render/vue/components/slider/slideMixin.js | 59 +-
.../vue/components/slider/slider-neighbor.css | 21 +
.../vue/components/slider/slider-neighbor.js | 182 +++++++
html5/render/vue/core/node.js | 55 +-
html5/render/vue/core/style.js | 135 +++--
html5/render/vue/env/global.js | 1 +
html5/render/vue/index.js | 2 +-
html5/render/vue/mixins/base.js | 48 +-
html5/render/vue/modules/animation.js | 20 +-
html5/render/vue/modules/dom.js | 42 +-
html5/render/vue/modules/webview.js | 20 +-
html5/render/vue/utils/component.js | 83 +--
html5/render/vue/utils/event.js | 32 +-
html5/render/vue/utils/lazyload.js | 24 +-
html5/render/vue/utils/perf.js | 74 ++-
html5/render/vue/utils/style.js | 43 +-
html5/test/render/vue/core/node.js | 62 +++
html5/test/render/vue/core/style.js | 15 +-
.../vue/data/build/dotvue/scoped-style.js | 543 -------------------
html5/test/render/vue/data/css/head14.css | 1 +
.../render/vue/data/dotvue/event-bubble-bar.vue | 20 +
.../render/vue/data/dotvue/event-bubble.vue | 25 +
.../vue/data/dotvue/first-screen-appear-foo.vue | 27 +
.../vue/data/dotvue/first-screen-appear.vue | 21 +
.../render/vue/data/dotvue/scoped-style.vue | 16 +-
html5/test/render/vue/data/head-css.js | 1 +
html5/test/render/vue/data/head-map.js | 3 +-
html5/test/render/vue/helper/main.js | 85 +++
html5/test/render/vue/helper/mixin/done.js | 9 +
html5/test/render/vue/helper/mixin/index.js | 1 +
html5/test/render/vue/helper/runtime.js | 40 +-
html5/test/render/vue/utils/component.js | 40 ++
html5/test/render/vue/vender/vue-2.0.0.js | 7 -
html5/test/render/vue/vender/vue-2.1.0.js | 8 -
ios/playground/Podfile | 2 +-
.../Sources/Component/WXComponent_internal.h | 1 -
.../WeexSDK/Sources/Component/WXListComponent.m | 5 +-
.../WeexSDK/Sources/Loader/WXResourceLoader.m | 6 +
.../Sources/Manager/WXComponentManager.m | 7 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 23 +-
.../Sources/Network/WXResourceRequestHandler.h | 3 +
.../WXResourceRequestHandlerDefaultImpl.m | 6 +
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 4 +-
.../Sources/View/WXComponent+ViewManagement.m | 1 -
package.json | 4 +-
packages/weex-vue-render/package.json | 4 +-
test/pages/components/textarea-maxlength.vue | 8 +-
test/pages/dom-operation.vue | 18 +-
test/pages/image-onload.vue | 4 +-
test/pages/index.vue | 4 +-
test/pages/list-scroll.vue | 5 +-
test/pages/scroller-scroll.vue | 4 +-
test/pages/slider-infinite.vue | 4 +-
test/run.sh | 1 -
test/scripts/components/scroll-event.test.js | 8 +-
test/scripts/components/slider-infinite.test.js | 4 +-
test/scripts/components/text.test.js | 2 +-
.../components/textarea-maxlength.test.js | 6 +-
test/scripts/dom.test.js | 40 +-
71 files changed, 1286 insertions(+), 949 deletions(-)
----------------------------------------------------------------------