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/07/13 09:49:13 UTC
[07/11] incubator-weex git commit: Merge branch '0.15-hub-dev' into
0.15-dev
Merge branch '0.15-hub-dev' into 0.15-dev
* 0.15-hub-dev: (62 commits)
+ [android] add scroll event on horizontal scroller
* [ios] bugfix when roate3d concat
* [android] fix invalid call scrollToElement when has not option param
* [android] change 'contentSize' value in list 'scroll' event, use value caculate by layout engine. @not-danger
* [android] add 'osName' to config
* [ios] add mutex for text attributedString and coreText framesetter
* [ios] add exception line and column
* [doc] add docs for the meta module, both in English and in Chinese
* [ios] add osName for the environment
* [html5] edit package.json
* [html5] fix eslint error
Merge branch '0.14-dev' of https://github.com/apache/incubator-weex into 0.14-dev
* [html5] change karma config to suit the test scenario
* [example] update gcanvas version and example
* [android] Fix camera NPE.
* [html5] fix webSocket unit test code
* [html5] fix test for getHeadStyleMap & @notdanger
* [html5] update vue-loader verison.
+ [html5] support vue-loader ^12.0
* [ios] support iPad when screen rotation
...
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/512c4558
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/512c4558
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/512c4558
Branch: refs/heads/0.15-dev
Commit: 512c4558076fedad5f484fd21680240a6ab29473
Parents: e62a61f 1b44388
Author: atomtong <to...@qq.com>
Authored: Thu Jul 6 14:21:27 2017 +0800
Committer: atomtong <to...@qq.com>
Committed: Thu Jul 6 14:21:27 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/WXEnvironment.java | 4 +
.../java/com/taobao/weex/WXSDKInstance.java | 16 ++
.../com/taobao/weex/bridge/WXBridgeManager.java | 12 +-
.../java/com/taobao/weex/common/WXConfig.java | 1 +
.../com/taobao/weex/common/WXImageStrategy.java | 9 +-
.../main/java/com/taobao/weex/dom/WXAttr.java | 38 ++--
.../com/taobao/weex/dom/WXImageQuality.java | 4 +-
.../com/taobao/weex/dom/action/Actions.java | 4 +-
.../taobao/weex/ui/component/WXComponent.java | 26 ++-
.../taobao/weex/ui/component/WXScroller.java | 79 ++++---
.../ui/component/list/BasicListComponent.java | 73 ++++--
.../taobao/weex/ui/component/list/WXCell.java | 9 +
.../weex/ui/view/WXHorizontalScrollView.java | 27 +++
.../com/taobao/weex/ui/view/WXScrollView.java | 1 -
.../java/com/taobao/weex/dom/WXAttrTest.java | 19 +-
build/karma.vue.conf.js | 9 +-
build/webpack.examples.web.config.js | 1 +
build/webpack.test.web.config.js | 1 +
doc/_config.yml | 6 +
doc/_config_cn.yml | 6 +
doc/source/cn/references/components/text.md | 64 +++---
doc/source/cn/references/modules/dom.md | 2 +-
doc/source/cn/references/modules/meta.md | 96 ++++++++
doc/source/cn/references/weex-variable.md | 1 +
doc/source/references/components/text.md | 69 +++---
doc/source/references/modules/dom.md | 2 +-
doc/source/references/modules/meta.md | 97 ++++++++
doc/source/references/weex-variable.md | 1 +
doc/themes/weex/layout/_partial/head.ejs | 3 +
doc/themes/weex/layout/layout.ejs | 15 ++
doc/themes/weex/source/css/common.scss | 14 +-
doc/themes/weex/source/css/docsearch.min.css | 2 +
doc/themes/weex/source/css/media-queries.scss | 2 +-
.../weex/source/css/partial/highlight.scss | 7 +-
.../weex/source/css/partial/search-form.scss | 44 +++-
doc/themes/weex/source/css/variable.scss | 4 +-
doc/themes/weex/source/js/docsearch.min.js | 7 +
examples/vue/index.vue | 1 +
examples/vue/market/gcanvas.vue | 36 ++-
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 | 51 +++--
html5/render/vue/env/global.js | 2 +
html5/render/vue/env/weex.js | 6 +
html5/render/vue/mixins/scrollable.js | 38 ++--
html5/render/vue/mixins/style.js | 58 ++++-
html5/render/vue/modules/index.js | 2 +
html5/render/vue/modules/websocket/index.js | 26 +++
html5/render/vue/modules/websocket/websocket.js | 61 +++++
html5/render/vue/utils/style.js | 44 ++++
html5/shared/console.js | 10 +-
html5/test/render/vue/core/scope-style-map.js | 4 +
html5/test/render/vue/helper/utils.js | 10 +-
html5/test/render/vue/modules/modal.js | 225 +++++++++++++++++++
html5/test/render/vue/modules/websocket.js | 108 +++++++++
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +-
.../WeexSDK/Sources/Component/WXTextComponent.m | 26 ++-
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 24 +-
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 7 +
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 2 -
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 16 +-
package.json | 8 +-
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 +-
72 files changed, 1511 insertions(+), 323 deletions(-)
----------------------------------------------------------------------