From 67196b36bb3a4d880c4397ec48c84f1eb8d500c0 Mon Sep 17 00:00:00 2001
From: Tadeu Zagallo <tadeuzagallo@fb.com>
Date: Fri, 1 May 2015 06:11:24 -0700
Subject: [PATCH] [ReactNative] Fix WebView executor

---
 React/Executors/RCTWebViewExecutor.m | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/React/Executors/RCTWebViewExecutor.m b/React/Executors/RCTWebViewExecutor.m
index 09628850f..a180bae2c 100644
--- a/React/Executors/RCTWebViewExecutor.m
+++ b/React/Executors/RCTWebViewExecutor.m
@@ -42,13 +42,17 @@ static void RCTReportError(RCTJavaScriptCallback callback, NSString *fmt, ...)
 {
   UIWebView *_webView;
   NSMutableDictionary *_objectsToInject;
+  NSRegularExpression *_commentsRegex;
 }
 
+@synthesize valid = _valid;
+
 - (instancetype)initWithWebView:(UIWebView *)webView
 {
   if ((self = [super init])) {
     _objectsToInject = [[NSMutableDictionary alloc] init];
     _webView = webView ?: [[UIWebView alloc] init];
+    _commentsRegex = [NSRegularExpression regularExpressionWithPattern:@"(^ *?\\/\\/.*?$|\\/\\*\\*[\\s\\S]+?\\*\\/)" options:NSRegularExpressionAnchorsMatchLines error:NULL];
     _webView.delegate = self;
   }
   return self;
@@ -59,13 +63,9 @@ static void RCTReportError(RCTJavaScriptCallback callback, NSString *fmt, ...)
   return [self initWithWebView:nil];
 }
 
-- (BOOL)isValid
-{
-  return _webView != nil;
-}
-
 - (void)invalidate
 {
+  _valid = NO;
   _webView.delegate = nil;
   _webView = nil;
 }
@@ -129,10 +129,21 @@ static void RCTReportError(RCTJavaScriptCallback callback, NSString *fmt, ...)
   }
 
   RCTAssert(onComplete != nil, @"");
-  _onApplicationScriptLoaded = onComplete;
+  __weak RCTWebViewExecutor *weakSelf = self;
+  _onApplicationScriptLoaded = ^(NSError *error){
+    RCTWebViewExecutor *strongSelf = weakSelf;
+    if (!strongSelf) {
+      return;
+    }
+    strongSelf->_valid = error == nil;
+    onComplete(error);
+  };
+
+  script = [_commentsRegex stringByReplacingMatchesInString:script
+                                                    options:0
+                                                      range:NSMakeRange(0, script.length)
+                                               withTemplate:@""];
 
-  script = [script stringByReplacingOccurrencesOfString:@"<script>" withString:@""];
-  script = [script stringByReplacingOccurrencesOfString:@"</script>" withString:@""];
   if (_objectsToInject.count > 0) {
     NSMutableString *scriptWithInjections = [[NSMutableString alloc] initWithString:@"/* BEGIN NATIVELY INJECTED OBJECTS */\n"];
     [_objectsToInject enumerateKeysAndObjectsUsingBlock:^(NSString *objectName, NSString *blockScript, BOOL *stop) {