You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/04/10 02:46:19 UTC
[4/4] incubator-weex git commit: Merge branch '0.12-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
* '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex:
* [test] update slider testcase
+ [ios] add feature timer
* [jsfm] v0.20.3
* [android] fix NPE in move fixed view
* [doc] add scrollToElement animation support
eslint warning
* [jsfm] fix function markupState
call C++ timer instead of WxTimerModule with in week jsfm
* [example] fix banner
* [jsfm] v0.20.2
* [android] disable click event when gesture already consume touch event
* [android] fix the invaild interval time and add testcase
* [android] disable auto scroll on not infinite
* [android] slider improvement
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/35a3f8c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/35a3f8c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/35a3f8c2
Branch: refs/heads/0.12-dev
Commit: 35a3f8c2197a4d796bab323d5e0c37712f038909
Parents: e482369 43eb4df
Author: zshshr <zh...@gmail.com>
Authored: Mon Apr 10 10:46:12 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Mon Apr 10 10:46:12 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/WXSDKInstance.java | 10 ++-
.../taobao/weex/ui/component/WXComponent.java | 4 +
.../com/taobao/weex/ui/component/WXSlider.java | 81 ++++++++++++++++++--
.../taobao/weex/ui/view/WXCircleViewPager.java | 21 +++--
.../taobao/weex/ui/view/gesture/WXGesture.java | 14 ++++
build/webpack.examples.config.js | 4 +-
doc/source/cn/references/modules/dom.md | 3 +-
doc/source/references/modules/dom.md | 3 +-
examples/module/componentRect.we | 4 +-
html5/frameworks/legacy/app/ctrl/init.js | 42 ++++++++--
html5/frameworks/legacy/static/life.js | 8 +-
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 4 +
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 77 +++++++++++++++++++
.../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 5 ++
package.json | 6 +-
test/pages/slider-infinite.vue | 49 ++++++++++++
test/scripts/components/slider-infinite.test.js | 38 +++++++++
17 files changed, 342 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/35a3f8c2/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------