[TIMOB-23327] iOS: Removed firstLoad property

tidev · May 26, 2016 · 727a56f · 727a56f
1 parent b46b397
commit 727a56f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/apidoc/Titanium/UI/WebView.yml b/apidoc/Titanium/UI/WebView.yml
@@ -428,7 +428,7 @@ properties:
         that is loaded will not be stopped even if it matches the blacklist.
     type: Array<String>
     since: "5.4.0"
-    platforms: [android]
+    platforms: [android,iphone,ipad]
     availability: creation
 
   - name: data
@@ -452,13 +452,6 @@ properties:
     default: false
     platforms: [iphone, ipad]
 
-  - name: blacklistFirstLoad
-    summary: Determines if the initial webview url will be checked against the blacklist.
-    platforms: [iphone,iphone]
-    type: Boolean
-    default: false
-    since: "5.4.0"
-
   - name: enableJavascriptInterface
     summary: Enable adding javascript interfaces internally to webview prior to JELLY_BEAN_MR1 (Android 4.2)
     description: |

diff --git a/iphone/Classes/TiUIWebView.h b/iphone/Classes/TiUIWebView.h
@@ -29,7 +29,6 @@
     BOOL willHandleUrl;
     NSString* lastValidLoad;
     NSMutableArray* blacklistedURLs;
-    BOOL blacklistFirstLoad;
 }
 
 @property(nonatomic,readonly) id url;

diff --git a/iphone/Classes/TiUIWebView.m b/iphone/Classes/TiUIWebView.m
@@ -410,11 +410,6 @@ -(void)setBlacklistedURLs_:(id)value
     }
 }
 
--(void)setBlacklistFirstLoad_:(id)value
-{
-    ENSURE_TYPE(value, [NSNumber class]);
-    blacklistFirstLoad = [TiUtils boolValue:value def:NO];
-}
 
 -(void)setBackgroundColor_:(id)color
 {
@@ -717,10 +712,10 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
         RELEASE_TO_NIL(lastValidLoad);
     }
 
-    if (blacklistedURLs && blacklistFirstLoad) {
+    if (blacklistedURLs) {
         for (NSString*check in blacklistedURLs)
         {
-            if ([newUrl.absoluteString containsString:[TiUtils stringValue:check]]) {
+            if ([[newUrl absoluteString] rangeOfString:check options:NSCaseInsensitiveSearch].location != NSNotFound) {
                 if([self.proxy _hasListeners:@"onStopBlacklistedUrl"]) {
                     NSDictionary* evt = [NSDictionary dictionaryWithObjectsAndKeys:[TiUtils stringValue:request], @"url", @"Webview did not load blacklisted url.", @"messsage", nil];
                     [self.proxy fireEvent:@"onStopBlacklistedUrl" withObject:evt];
@@ -729,8 +724,7 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
             }
         }
     }
-	//Once this is set to true the blacklist check will be done
-	blacklistFirstLoad = true;
+
 	NSString * scheme = [[newUrl scheme] lowercaseString];
 	if ([scheme hasPrefix:@"http"] || [scheme isEqualToString:@"ftp"]
 			|| [scheme isEqualToString:@"file"] || [scheme isEqualToString:@"app"]) {