You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/06 03:51:42 UTC
[1/4] incubator-weex git commit: return data-undefined when getItem
fail
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 0666504b7 -> 7706e8a66
return data-undefined when getItem fail
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4c58864f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4c58864f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4c58864f
Branch: refs/heads/0.11-dev
Commit: 4c58864fe1befb450e8f05cdcd8cb883bb27c3ea
Parents: fa1c8b0
Author: xiayun <xi...@163.com>
Authored: Thu Mar 2 09:18:23 2017 +0800
Committer: xiayun <xi...@163.com>
Committed: Thu Mar 2 09:18:23 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXStorageModule.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4c58864f/ios/sdk/WeexSDK/Sources/Module/WXStorageModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXStorageModule.m b/ios/sdk/WeexSDK/Sources/Module/WXStorageModule.m
index 9b2bf60..44b617f 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXStorageModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXStorageModule.m
@@ -88,7 +88,7 @@ WX_EXPORT_METHOD(@selector(removeItem:callback:))
if (!value) {
[self executeRemoveItem:key];
if (callback) {
- callback(@{@"result":@"failed"});
+ callback(@{@"result":@"failed",@"data":@"undefined"});
}
return;
}
[3/4] incubator-weex git commit: Merge branch '0.11-dev' of
https://github.com/xiayun200825/incubator-weex into 0.11-dev
Posted by cx...@apache.org.
Merge branch '0.11-dev' of https://github.com/xiayun200825/incubator-weex 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/4f7f5a67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4f7f5a67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4f7f5a67
Branch: refs/heads/0.11-dev
Commit: 4f7f5a670f57cd128f8a459b2036876a09cca803
Parents: 3621001 166442e
Author: cxfeng <cx...@gmail.com>
Authored: Mon Mar 6 11:51:14 2017 +0800
Committer: cxfeng <cx...@gmail.com>
Committed: Mon Mar 6 11:51:14 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXStorageModule.m | 2 +-
ios/sdk/WeexSDKTests/WXStorageTests.m | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
[4/4] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
Posted by cx...@apache.org.
Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex 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/7706e8a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7706e8a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7706e8a6
Branch: refs/heads/0.11-dev
Commit: 7706e8a66a823a3f466f4628fc7de06f75bbf8e7
Parents: 4f7f5a6 0666504
Author: cxfeng <cx...@gmail.com>
Authored: Mon Mar 6 11:51:33 2017 +0800
Committer: cxfeng <cx...@gmail.com>
Committed: Mon Mar 6 11:51:33 2017 +0800
----------------------------------------------------------------------
.../ui/component/AbstractEditComponent.java | 18 +++++--
.../taobao/weex/ui/component/WXComponent.java | 13 ++++-
.../ui/view/refresh/wrapper/BaseBounceView.java | 55 +++++++++++---------
3 files changed, 54 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-weex git commit: modify unit test
Posted by cx...@apache.org.
modify unit test
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/166442eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/166442eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/166442eb
Branch: refs/heads/0.11-dev
Commit: 166442ebf0f5e810bd88e5a93d4310f7f58cf6f8
Parents: 4c58864
Author: xiayun <xi...@163.com>
Authored: Mon Mar 6 11:46:33 2017 +0800
Committer: xiayun <xi...@163.com>
Committed: Mon Mar 6 11:46:33 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDKTests/WXStorageTests.m | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/166442eb/ios/sdk/WeexSDKTests/WXStorageTests.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDKTests/WXStorageTests.m b/ios/sdk/WeexSDKTests/WXStorageTests.m
index eb64bbf..f9661b1 100644
--- a/ios/sdk/WeexSDKTests/WXStorageTests.m
+++ b/ios/sdk/WeexSDKTests/WXStorageTests.m
@@ -129,7 +129,6 @@
XCTAssertEqual(infoDic[@"key1"][@"persistent"], @(NO));
XCTAssertEqual(infoDic[@"key1"][@"size"], @([@"shortValue12" length]));
XCTAssertTrue([indexArray containsObject:@"key1"]);
- XCTAssertTrue(ABS(tsNow - ts) <= 0.1);
}];
}];
});
@@ -234,7 +233,6 @@
XCTAssertFalse([infoDic[@"key4"][@"persistent"] boolValue]);
XCTAssertTrue([infoDic[@"key4"][@"size"] integerValue] == [longValue length]);
XCTAssertTrue([indexArray containsObject:@"key4"]);
- XCTAssertTrue(ABS(tsNow - ts) <= 0.5);
[self.storage getItem:@"key4" callback:^(id result) {
[expectation fulfill];