Merge branch '0.14-dev' into 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/44e959a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/44e959a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/44e959a4 Branch: refs/heads/0.15-dev Commit: 44e959a418737511c3215fcabb5a121cecc3f7f1 Parents: 2510206 24fbad2 Author: sospartan <sospar...@apache.org> Authored: Wed Jun 28 16:44:48 2017 +0800 Committer: sospartan <sospar...@apache.org> Committed: Wed Jun 28 16:44:48 2017 +0800 ---------------------------------------------------------------------- android/sdk/libs/armeabi/libweexjsc.so | Bin 7575352 -> 7570504 bytes android/sdk/libs/x86/libweexjsc.so | Bin 12130116 -> 12121924 bytes .../java/com/taobao/weex/ComponentObserver.java | 50 ++++++++ .../java/com/taobao/weex/WXSDKInstance.java | 16 +++ .../taobao/weex/ui/component/WXComponent.java | 14 +++ .../ui/component/list/BasicListComponent.java | 16 ++- examples/vue/index.vue | 1 + examples/vue/modules/websocket.vue | 116 +++++++++++++++++++ html5/render/vue/README.md | 19 ++- html5/render/vue/components/input.js | 52 +++++++-- .../components/scrollable/loading-indicator.js | 11 +- .../render/vue/components/slider/slideMixin.js | 24 ++-- html5/render/vue/core/style.js | 31 +++-- html5/render/vue/env/weex.js | 3 + html5/render/vue/mixins/scrollable.js | 38 +++--- html5/render/vue/modules/index.js | 2 + html5/render/vue/modules/websocket/index.js | 26 +++++ html5/render/vue/modules/websocket/websocket.js | 60 ++++++++++ html5/render/vue/utils/style.js | 44 +++++++ html5/test/render/vue/modules/websocket.js | 11 ++ .../Sources/Component/WXCycleSliderComponent.m | 7 ++ package.json | 2 +- packages/weex-vue-render/package.json | 2 +- test/pages/components/textarea-maxlength.vue | 10 +- .../components/textarea-maxlength.test.js | 6 +- test/scripts/util.js | 2 +- 26 files changed, 491 insertions(+), 72 deletions(-) ----------------------------------------------------------------------