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/06/08 10:49:39 UTC
[15/15] incubator-weex git commit: Merge branch 'dev' into 0.14-dev
Merge branch 'dev' 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/eeb8d5e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eeb8d5e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eeb8d5e9
Branch: refs/heads/0.14-dev
Commit: eeb8d5e920fe439eedfa995a770706df8e7498c8
Parents: cd91163 c689a8a
Author: sospartan <so...@apache.org>
Authored: Thu Jun 8 18:49:10 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jun 8 18:49:10 2017 +0800
----------------------------------------------------------------------
.../java/com/alibaba/weex/WXApplication.java | 2 +
.../weex/extend/component/WXParallax.java | 345 +++++++++++++++++++
.../com/taobao/weex/bridge/WXBridgeManager.java | 2 +-
.../weex/common/ICheckBindingScroller.java | 9 +
.../taobao/weex/ui/component/WXComponent.java | 11 +
.../taobao/weex/ui/component/WXScroller.java | 9 +-
.../taobao/weex/ui/component/WXVContainer.java | 13 +
.../ui/component/list/BasicListComponent.java | 9 +-
doc/source/cn/references/weex-variable.md | 4 +-
doc/source/references/modules/animation.md | 6 +-
doc/source/references/weex-variable.md | 4 +-
doc/themes/weex/languages/cn.yml | 2 +-
.../Sources/Component/WXCycleSliderComponent.m | 9 +-
ios/sdk/WeexSDK/Sources/Module/WXTimerModule.m | 4 +-
14 files changed, 414 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eeb8d5e9/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------