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/02/28 02:30:18 UTC
[38/50] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-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/94b0eec5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/94b0eec5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/94b0eec5
Branch: refs/heads/0.11-dev
Commit: 94b0eec5860d42cb3a0095f7ee055e96e66faa90
Parents: 4d89fea 639e51d
Author: acton393 <zh...@gmail.com>
Authored: Fri Feb 24 11:28:50 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Feb 24 11:28:50 2017 +0800
----------------------------------------------------------------------
.../weex/ui/component/WXSliderNeighbor.java | 39 ++++++++++++++++----
.../Sources/Component/WXSliderComponent.m | 35 ++++--------------
package.json | 2 +-
test/scripts/components/scroll-event.test.js | 28 +++++---------
test/scripts/dom.test.js | 12 ++----
test/scripts/index.test.js | 12 ++----
test/scripts/util.js | 24 ++++++++++++
7 files changed, 79 insertions(+), 73 deletions(-)
----------------------------------------------------------------------