You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by GitBox <gi...@apache.org> on 2018/12/10 12:16:11 UTC
[GitHub] wqyfavor closed pull request #1882: * [iOS] fix bundleTypeParse &&
ignoreInteraction flag
wqyfavor closed pull request #1882: * [iOS] fix bundleTypeParse && ignoreInteraction flag
URL: https://github.com/apache/incubator-weex/pull/1882
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
index e82917787d..7fa9b2889f 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
@@ -666,7 +666,7 @@ - (bool)_isParserByRegEx
if ([configCenter respondsToSelector:@selector(configForKey:defaultValue:isDefault:)]) {
useRegEx = [[configCenter configForKey:@"iOS_weex_ext_config.parserTypeByRegEx" defaultValue:@(YES) isDefault:NULL] boolValue];
}
- return false;
+ return useRegEx;
}
- (void)destroyInstance:(NSString *)instance
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
index 504ee662db..114598cb98 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
@@ -288,9 +288,7 @@ - (void)addComponent:(NSString*)ref
if (supercomponent.ignoreInteraction) {
component.ignoreInteraction = YES;
}
- if ([[component.attributes objectForKey:@"ignoreInteraction"] isEqualToString:@"1"]) {
- component.ignoreInteraction = YES;
- }
+ component.ignoreInteraction = [[component.attributes objectForKey:@"ignoreInteraction"] boolValue];
#ifdef DEBUG
WXLogDebug(@"flexLayout -> _recursivelyAddComponent : super:(%@,%@):[%f,%f] ,child:(%@,%@):[%f,%f],childClass:%@",
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services