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/08/10 09:38:16 UTC
[1/3] incubator-weex git commit: * [ios] try to fix attributedString
crash
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev e37769951 -> c20e93175
* [ios] try to fix attributedString 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/99086f30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/99086f30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/99086f30
Branch: refs/heads/0.16-dev
Commit: 99086f301c9a782ba50df4be9ea3fe22ad070581
Parents: 8b9845e
Author: acton393 <zh...@gmail.com>
Authored: Thu Aug 10 14:30:09 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Aug 10 14:30:09 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/99086f30/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 066b143..2afca0e 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -182,7 +182,6 @@ CGFloat WXTextDefaultLineThroughWidth = 1.2;
if (_needsRemoveObserver) {
[[NSNotificationCenter defaultCenter] removeObserver:self name:WX_ICONFONT_DOWNLOAD_NOTIFICATION object:nil];
}
- _ctAttributedString = nil;
pthread_mutex_destroy(&_ctAttributedStringMutex);
pthread_mutexattr_destroy(&_propertMutexAttr);
}
@@ -251,7 +250,11 @@ do {\
- (void)setNeedsRepaint
{
_textStorage = nil;
+
+ pthread_mutex_lock(&(_ctAttributedStringMutex));
_ctAttributedString = nil;
+ pthread_mutex_unlock(&(_ctAttributedStringMutex));
+
}
#pragma mark - Subclass
[2/3] incubator-weex git commit: * [ios] fix handle appear event crash
Posted by ac...@apache.org.
* [ios] fix handle appear event 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/64f0e336
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/64f0e336
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/64f0e336
Branch: refs/heads/0.16-dev
Commit: 64f0e3368044ed8152b5ae78ce5d6ea0acba5bff
Parents: 99086f3
Author: acton393 <zh...@gmail.com>
Authored: Thu Aug 10 14:33:52 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Aug 10 14:33:52 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/64f0e336/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
index c4c324a..a960cc6 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -560,7 +560,8 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
CGRect scrollRect = CGRectMake(vx, vy, vw, vh);;
// notify action for appear
- for(WXScrollToTarget *target in self.listenerArray){
+ NSArray *listenerArrayCopy = [self.listenerArray copy];
+ for(WXScrollToTarget *target in listenerArrayCopy){
[self scrollToTarget:target scrollRect:scrollRect];
}
}
[3/3] incubator-weex git commit: Merge branch '0.16-dev' of
https://github.com/acton393/incubator-weex into wip-us-0.16-dev
Posted by ac...@apache.org.
Merge branch '0.16-dev' of https://github.com/acton393/incubator-weex into wip-us-0.16-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/c20e9317
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c20e9317
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c20e9317
Branch: refs/heads/0.16-dev
Commit: c20e93175f5520b43a347acd84d0bfc49c4b1b8b
Parents: e377699 64f0e33
Author: acton393 <zh...@gmail.com>
Authored: Thu Aug 10 17:08:35 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Aug 10 17:08:35 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 3 ++-
ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------