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:33 UTC
[22/50] [abbrv] incubator-weex git commit: * [ios] adjust notify time
* [ios] adjust notify time
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b35086f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b35086f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b35086f5
Branch: refs/heads/master
Commit: b35086f5a7d1f3ee689621fbdb2eaadc7a273745
Parents: 83bcade
Author: acton393 <zh...@gmail.com>
Authored: Wed Jan 11 11:21:28 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Jan 11 11:21:28 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 3 +--
ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b35086f5/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 960e253..2f7f29c 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -406,8 +406,6 @@ do {\
pthread_mutex_unlock(&_textStorageMutex);
}
- [self readyToShow]; // notify super component
-
return textStorage;
}
@@ -425,6 +423,7 @@ do {\
if (_isUsingTextStorageLock) {
pthread_mutex_unlock(&_textStorageMutex);
}
+ [self readyToShow]; // notify super component
[self setNeedsDisplay];
}
}];
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b35086f5/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 152d671..6c2c06d 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
@@ -374,8 +374,8 @@ static css_node_t * rootNodeGetChild(void *context, int i)
[self filterStyles:styles normalStyles:normalStyles resetStyles:resetStyles];
[component _updateStylesOnComponentThread:normalStyles resetStyles:resetStyles isUpdateStyles:isUpdateStyles];
[self _addUITask:^{
- [component readyToShow];
[component _updateStylesOnMainThread:normalStyles resetStyles:resetStyles];
+ [component readyToShow];
}];
}
@@ -389,8 +389,8 @@ static css_node_t * rootNodeGetChild(void *context, int i)
[component _updateAttributesOnComponentThread:attributes];
[self _addUITask:^{
- [component readyToShow];
[component _updateAttributesOnMainThread:attributes];
+ [component readyToShow];
}];
}