Merge remote-tracking branch 'upstream/0.16-dev' into 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/20771648 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/20771648 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/20771648 Branch: refs/heads/0.16-dev Commit: 20771648e257894b8ba870b895c9db8148088e7e Parents: 8eb26bb 915935b Author: misakuo <misa...@apache.org> Authored: Tue Sep 26 15:53:51 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Tue Sep 26 15:53:51 2017 +0800 ---------------------------------------------------------------------- build/build.js | 17 +- build/config.js | 12 +- build/karma.vue.conf.js | 2 + examples/vue/showcase/a-node-click.vue | 6 +- html5/render/vue/README.md | 42 +++++ html5/render/vue/components/a.js | 19 +-- html5/render/vue/components/div.js | 4 +- html5/render/vue/components/input.js | 7 +- html5/render/vue/components/scrollable/cell.js | 3 +- .../render/vue/components/scrollable/header.js | 5 +- html5/render/vue/components/scrollable/list.js | 2 +- .../components/scrollable/loading-indicator.js | 13 +- .../components/scrollable/mixins/scrollable.js | 59 +++---- .../vue/components/scrollable/scroller.js | 2 +- .../render/vue/components/scrollable/style.css | 22 ++- .../vue/components/scrollable/waterfall.js | 2 +- html5/render/vue/components/slider/index.js | 2 + html5/render/vue/components/slider/indicator.js | 2 + .../render/vue/components/slider/slideMixin.js | 13 +- html5/render/vue/components/slider/slider.css | 6 + html5/render/vue/components/switch.js | 12 +- html5/render/vue/components/text.js | 3 + html5/render/vue/core/node.js | 148 +++++----------- html5/render/vue/env/event-manager.js | 168 +++++++++++++++++++ html5/render/vue/env/viewport.js | 8 + html5/render/vue/env/weex.js | 21 +++ html5/render/vue/index.js | 15 ++ html5/render/vue/lib/envd/index.js | 6 +- html5/render/vue/lib/gesture.js | 2 +- html5/render/vue/mixins/base.js | 4 +- html5/render/vue/mixins/input-common.js | 38 ++++- html5/render/vue/mixins/style.js | 18 +- html5/render/vue/modules/animation.js | 44 +++-- html5/render/vue/modules/index.js | 4 +- html5/render/vue/modules/meta.js | 36 ++++ html5/render/vue/modules/modal/style.js | 20 ++- html5/render/vue/styles/base.css | 15 ++ html5/render/vue/styles/reset.css | 5 +- html5/render/vue/utils/component.js | 166 +++++++++++------- html5/render/vue/utils/event.js | 16 ++ html5/render/vue/utils/func.js | 5 +- html5/render/vue/utils/style.js | 13 +- html5/test/render/vue/components/switch.js | 5 +- html5/test/render/vue/components/text.js | 4 +- html5/test/render/vue/components/web.js | 4 +- html5/test/render/vue/helper/index.js | 11 ++ html5/test/render/vue/utils/component.js | 5 - ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +- package.json | 6 +- .../weex-vue-slider/package.json | 2 +- packages/weex-vue-render/README.md | 42 +++++ packages/weex-vue-render/package.json | 8 +- packages/weex-vue-render/src/index.core.js | 20 ++- packages/weex-vue-render/src/index.js | 17 +- scripts/release_files.rules | 1 + vue.html | 15 +- 56 files changed, 810 insertions(+), 339 deletions(-) ----------------------------------------------------------------------