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 11:40:18 UTC
[1/2] incubator-weex git commit: * [ios] copy updates block to avoid
crash
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev e18f5512d -> 756754fcb
* [ios] copy updates block to avoid crash
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6e9decbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6e9decbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6e9decbf
Branch: refs/heads/0.11-dev
Commit: 6e9decbfb0aebce96919995e2c9c631ae6f24f8e
Parents: c0b9b1d
Author: \u9690\u98ce <cx...@gmail.com>
Authored: Mon Mar 6 19:35:44 2017 +0800
Committer: \u9690\u98ce <cx...@gmail.com>
Committed: Mon Mar 6 19:35:44 2017 +0800
----------------------------------------------------------------------
.../Component/Recycler/WXRecyclerUpdateController.m | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e9decbf/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m
index 31c9dd0..9fb0f59 100644
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m
+++ b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m
@@ -131,19 +131,19 @@
return;
}
- void (^updates)() = ^{
+ void (^updates)() = [^{
[UIView setAnimationsEnabled:NO];
WXLogDebug(@"UICollectionView update:%@", diffResult);
[self applyUpdate:diffResult toCollectionView:self.collectionView];
- };
+ } copy];
- void (^completion)(BOOL) = ^(BOOL finished) {
+ void (^completion)(BOOL) = [^(BOOL finished) {
[UIView setAnimationsEnabled:YES];
self.isUpdating = NO;
[self.delegate updateController:self didPerformUpdateWithFinished:finished];
[self.reloadIndexPaths removeAllObjects];
[self checkUpdates];
- };
+ } copy];
self.isUpdating = YES;
@@ -153,7 +153,7 @@
[self.delegate updateController:self willPerformUpdateWithNewData:newData];
- NSLog(@"Diff result:%@", diffResult);
+ WXLogDebug(@"Diff result:%@", diffResult);
[collectionView performBatchUpdates:updates completion:completion];
}
[2/2] incubator-weex git commit: Merge branch '0.11-dev' of
https://github.com/cxfeng1/incubator-weex into 0.11-dev
Posted by cx...@apache.org.
Merge branch '0.11-dev' of https://github.com/cxfeng1/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/756754fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/756754fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/756754fc
Branch: refs/heads/0.11-dev
Commit: 756754fcb9ffb43a9f43e17c68055376faa78650
Parents: e18f551 6e9decb
Author: cxfeng <cx...@gmail.com>
Authored: Mon Mar 6 19:40:09 2017 +0800
Committer: cxfeng <cx...@gmail.com>
Committed: Mon Mar 6 19:40:09 2017 +0800
----------------------------------------------------------------------
.../Component/Recycler/WXRecyclerUpdateController.m | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------