From 7dd26bf5a77f8721c66b98ce6666d29f774a7e17 Mon Sep 17 00:00:00 2001 From: Terje Tjervaag Date: Wed, 11 Nov 2020 10:24:32 +0100 Subject: [PATCH] Reinstate verification of main navigation in case of navigationType other --- .../CDVIntentAndNavigationFilter.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.m b/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.m index a098be2b9..3021f8f57 100644 --- a/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.m +++ b/CordovaLib/Classes/Private/Plugins/CDVIntentAndNavigationFilter/CDVIntentAndNavigationFilter.m @@ -108,9 +108,11 @@ - (CDVIntentAndNavigationFilterValue) filterUrl:(NSURL*)url + (BOOL)shouldOpenURLRequest:(NSURLRequest*)request navigationType:(CDVWebViewNavigationType)navigationType { + BOOL isMainNavigation = [[request.mainDocumentURL absoluteString] isEqualToString:[request.URL absoluteString]]; + return ( navigationType == CDVWebViewNavigationTypeLinkClicked || - navigationType == CDVWebViewNavigationTypeLinkOther + (navigationType == CDVWebViewNavigationTypeLinkOther && isMainNavigation) ); }