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/20 03:33:56 UTC
[2/3] incubator-weex git commit: Merge branch '0.15-dev-feature-jsfm'
into 0.15-dev
Merge branch '0.15-dev-feature-jsfm' into 0.15-dev
* 0.15-dev-feature-jsfm:
* [jsfm] js framework version update to 0.21.1
* [android] fix invalid init index
+ [ios] delete ;
+ [ios] update default to cycslider
* [ios] add more note about get component method @nodanger
* [ios] get component rectangle when component view is not ready
+ [ios] update default to cycslider
* [ios] fix text compatible problem
* [doc] Update doc of timer.
* [html5] bind click listener to event tap.
* [ios] add some change note.
*[ios] fix bug in linear-gradient color update
* [android] fix invalid init index
* [android] fix invalid init index
* [android] fix invalid init index
* [android] fix bug that WXText lines cannot be reset
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e1df3db3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e1df3db3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e1df3db3
Branch: refs/heads/0.15-dev
Commit: e1df3db3ef12a3459ee1f0a4935d773509db35ad
Parents: a9c7aaf 161f897
Author: atomtong <to...@qq.com>
Authored: Wed Jul 19 15:32:15 2017 +0800
Committer: atomtong <to...@qq.com>
Committed: Wed Jul 19 15:32:15 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/dom/WXTextDomObject.java | 4 +-
.../com/taobao/weex/ui/component/WXSlider.java | 10 +-
doc/source/cn/references/modules/timer.md | 47 +++++
doc/source/references/modules/timer.md | 59 +++++++
.../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 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 2 +-
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 8 +-
.../Sources/View/WXComponent+ViewManagement.m | 4 +
package.json | 2 +-
packages/weex-vue-render/package.json | 8 +-
pre-build/native-bundle-main.js | 16 +-
22 files changed, 355 insertions(+), 100 deletions(-)
----------------------------------------------------------------------