You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/06/01 07:47:23 UTC
[1/3] incubator-weex git commit: + [ios] update macaca case to android
Repository: incubator-weex
Updated Branches:
refs/heads/0.14-dev 4ec5d449c -> 76dd7751a
+ [ios] update macaca case to android
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/da396f4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/da396f4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/da396f4d
Branch: refs/heads/0.14-dev
Commit: da396f4d4e19fe7e9c6e43b3709fe3d59720931c
Parents: 1ecfda6
Author: 齐山 <su...@163.com>
Authored: Thu May 25 17:42:19 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Thu May 25 17:42:19 2017 +0800
----------------------------------------------------------------------
test/scripts/components/recycler.test.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/da396f4d/test/scripts/components/recycler.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/recycler.test.js b/test/scripts/components/recycler.test.js
index 07ad585..32586ff 100644
--- a/test/scripts/components/recycler.test.js
+++ b/test/scripts/components/recycler.test.js
@@ -366,9 +366,9 @@ describe('recycler @ignore-android @ignore-ios', function () {
console.log(text)
originContentOffset = Number.parseInt(text.replace('Content Offset:-',''))
})
- .touch('drag', {fromX:recyclerWidth / 2, fromY:screenHeight / 5, toX:recyclerWidth / 2, toY: screenHeight * 4 / 5})
+ .touch('drag', {fromX:recyclerWidth / 2, fromY:screenHeight / 5, toX:recyclerWidth / 2, toY: screenHeight * 4 / 5,duration:2})
.sleep(1000)
- .touch('drag', {fromX:recyclerWidth / 2, fromY:screenHeight / 5, toX:recyclerWidth / 2, toY: screenHeight * 4 / 5})
+ .touch('drag', {fromX:recyclerWidth / 2, fromY:screenHeight / 5, toX:recyclerWidth / 2, toY: screenHeight * 4 / 5,duration:2})
.elementById('stickyText1')
.text()
.then(text => {
[2/3] incubator-weex git commit: + [ios] fixbug: cycle slider
Posted by ac...@apache.org.
+ [ios] fixbug: cycle slider
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/00067c7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/00067c7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/00067c7d
Branch: refs/heads/0.14-dev
Commit: 00067c7d9a0cd75a6149af34956f29b4fb8c91a0
Parents: da396f4
Author: 齐山 <su...@163.com>
Authored: Fri May 26 18:03:48 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Fri May 26 18:03:48 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/00067c7d/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m
index 3b8adf8..8e3488c 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m
@@ -585,9 +585,10 @@ typedef NS_ENUM(NSInteger, Direction) {
- (void)recycleSliderView:(WXRecycleSliderView *)recycleSliderView didScrollToItemAtIndex:(NSInteger)index
{
- self.currentIndex = index;
- if (_sliderChangeEvent) {
+
+ if (_sliderChangeEvent && index != self.currentIndex) {
[self fireEvent:@"change" params:@{@"index":@(index)} domChanges:@{@"attrs": @{@"index": @(index)}}];
+ self.currentIndex = index;
}
}
[3/3] incubator-weex git commit: Merge branch
'ios-feature-macaca-0.13-dev-2' of https://github.com/kfeagle/incubator-weex
into wip-us-0.14-dev
Posted by ac...@apache.org.
Merge branch 'ios-feature-macaca-0.13-dev-2' of https://github.com/kfeagle/incubator-weex into wip-us-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/76dd7751
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/76dd7751
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/76dd7751
Branch: refs/heads/0.14-dev
Commit: 76dd7751a739b746afe36ad15bec07cddc511d10
Parents: 4ec5d44 00067c7
Author: acton393 <zh...@gmail.com>
Authored: Thu Jun 1 15:45:38 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Jun 1 15:45:38 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m | 5 +++--
test/scripts/components/recycler.test.js | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------