You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by da...@apache.org on 2017/06/26 09:13:53 UTC
[3/9] incubator-weex git commit: Merge branch '0.14-dev' of
https://github.com/apache/incubator-weex into 0.14-dev
Merge branch '0.14-dev' of https://github.com/apache/incubator-weex into 0.14-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/5c86cf3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5c86cf3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5c86cf3c
Branch: refs/heads/0.14-dev
Commit: 5c86cf3cbedc5988a7b50ae3d967bac03764d104
Parents: d0a5e4d 49ba77f
Author: erha19 <fa...@gmail.com>
Authored: Thu Jun 22 15:23:20 2017 +0800
Committer: erha19 <fa...@gmail.com>
Committed: Thu Jun 22 15:23:20 2017 +0800
----------------------------------------------------------------------
.../ui/component/AbstractEditComponent.java | 14 +-
.../com/taobao/weex/ui/component/Textarea.java | 6 +
.../taobao/weex/ui/component/WXComponent.java | 2 +-
.../com/taobao/weex/ui/view/WXEditText.java | 9 +-
html5/render/vue/components/index.js | 4 +-
html5/render/vue/components/input.js | 52 +++++--
.../components/scrollable/loading-indicator.js | 145 +++++++++++++++++--
.../render/vue/components/scrollable/loading.js | 4 +-
.../render/vue/components/scrollable/refresh.js | 4 +-
html5/render/vue/mixins/style.js | 11 +-
html5/render/vue/styles/base.css | 56 -------
html5/render/vue/utils/func.js | 30 ++++
html5/render/vue/utils/style.js | 49 +++++++
13 files changed, 292 insertions(+), 94 deletions(-)
----------------------------------------------------------------------