You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ji...@apache.org on 2017/01/24 08:21:39 UTC
[28/50] [abbrv] incubator-weex git commit: * [ios] rename method
* [ios] rename method
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a8720c24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a8720c24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a8720c24
Branch: refs/heads/master
Commit: a8720c24e1a5e20387d76d0343bf3d5840bb60eb
Parents: 6bccb06
Author: acton393 <zh...@gmail.com>
Authored: Wed Jan 11 13:12:14 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Jan 11 13:12:14 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m | 14 +++++++-------
ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 2 +-
ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m | 4 ++--
ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 4 ++--
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a8720c24/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
index 569c900..47040c7 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
@@ -225,7 +225,7 @@ static dispatch_queue_t WXImageUpdateQueue;
dispatch_async(dispatch_get_main_queue(), ^{
self.layer.contents = nil;
weakSelf.imageDownloadFinish = YES;
- [weakSelf readyToShow];
+ [weakSelf readyToRender];
});
}
});
@@ -249,7 +249,7 @@ static dispatch_queue_t WXImageUpdateQueue;
downloadFailedBlock(placeholderSrc,error);
if ([strongSelf isViewLoaded] && !viewImage) {
((UIImageView *)(strongSelf.view)).image = nil;
- [self readyToShow];
+ [self readyToRender];
}
return;
}
@@ -260,7 +260,7 @@ static dispatch_queue_t WXImageUpdateQueue;
if ([strongSelf isViewLoaded] && !viewImage) {
((UIImageView *)strongSelf.view).image = image;
weakSelf.imageDownloadFinish = YES;
- [self readyToShow];
+ [self readyToRender];
}
});
}];
@@ -289,7 +289,7 @@ static dispatch_queue_t WXImageUpdateQueue;
}
if (error) {
downloadFailedBlock(imageSrc, error);
- [strongSelf readyToShow];
+ [strongSelf readyToRender];
return ;
}
@@ -300,7 +300,7 @@ static dispatch_queue_t WXImageUpdateQueue;
if ([strongSelf isViewLoaded]) {
strongSelf.imageDownloadFinish = YES;
((UIImageView *)strongSelf.view).image = image;
- [strongSelf readyToShow];
+ [strongSelf readyToRender];
}
});
}];
@@ -308,11 +308,11 @@ static dispatch_queue_t WXImageUpdateQueue;
}
}
-- (void)readyToShow
+- (void)readyToRender
{
// when image download completely (success or failed)
if (self.weexInstance.trackComponent && _imageDownloadFinish) {
- [super readyToShow];
+ [super readyToRender];
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a8720c24/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index 2f7f29c..256bda1 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -423,7 +423,7 @@ do {\
if (_isUsingTextStorageLock) {
pthread_mutex_unlock(&_textStorageMutex);
}
- [self readyToShow]; // notify super component
+ [self readyToRender]; // notify super component
[self setNeedsDisplay];
}
}];
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a8720c24/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
index 6c2c06d..65f6e69 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
@@ -375,7 +375,7 @@ static css_node_t * rootNodeGetChild(void *context, int i)
[component _updateStylesOnComponentThread:normalStyles resetStyles:resetStyles isUpdateStyles:isUpdateStyles];
[self _addUITask:^{
[component _updateStylesOnMainThread:normalStyles resetStyles:resetStyles];
- [component readyToShow];
+ [component readyToRender];
}];
}
@@ -390,7 +390,7 @@ static css_node_t * rootNodeGetChild(void *context, int i)
[component _updateAttributesOnComponentThread:attributes];
[self _addUITask:^{
[component _updateAttributesOnMainThread:attributes];
- [component readyToShow];
+ [component readyToRender];
}];
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a8720c24/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.h b/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
index c02eb9a..e8d7c0e 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
@@ -341,9 +341,9 @@ typedef void(^WXDisplayCompeletionBlock)(CALayer *layer, BOOL finished);
- (WXDisplayBlock)displayBlock;
/**
- * renderFinish
+ * readyToRender
*/
-- (void)readyToShow;
+- (void)readyToRender;
/**
* @abstract Return a block to be called while drawing is finished.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a8720c24/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
index 6953ee7..f35da20 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -430,10 +430,10 @@
WXAssertMainThread();
}
-- (void)readyToShow
+- (void)readyToRender
{
if (self.weexInstance.trackComponent) {
- [self.supercomponent readyToShow];
+ [self.supercomponent readyToRender];
}
}