Merge remote-tracking branch 'remotes/upstream/0.15-dev' into 
android-bugfix-init-index


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0b6aeb12
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0b6aeb12
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0b6aeb12

Branch: refs/heads/0.15-dev
Commit: 0b6aeb121247770c5a5fd16e5c9e96f4b673b57b
Parents: 0228437 d33479d
Author: misakuo <misa...@apache.org>
Authored: Mon Jul 17 11:22:29 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Jul 17 11:22:29 2017 +0800

----------------------------------------------------------------------
 .../com/taobao/weex/dom/WXTextDomObject.java    |   4 +-
 .../vue/components/scrollable/list/index.js     |   3 +-
 .../vue/components/scrollable/scroller.js       |   3 +-
 .../vue/components/scrollable/waterfall.js      |   3 +-
 .../render/vue/components/slider/slideMixin.js  |  17 +-
 html5/render/vue/core/node.js                   | 172 ++++++++++++++-----
 html5/render/vue/env/wx-env.js                  |   2 +-
 html5/render/vue/mixins/base.js                 |  16 +-
 html5/render/vue/mixins/scrollable.js           |  18 +-
 html5/render/vue/utils/style.js                 |  30 +++-
 html5/test/render/vue/core/node.js              |  22 ++-
 .../WeexSDK/Sources/Component/WXTextComponent.m |   7 +-
 package.json                                    |   2 +-
 packages/weex-vue-render/package.json           |   8 +-
 14 files changed, 220 insertions(+), 87 deletions(-)
----------------------------------------------------------------------


Reply via email to