From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 15 Sep 2015 01:21:15 +0000 (+0800)
Subject: Do not use did-finish-load to detect whether WebContents is ready
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a8b11cf10f0c107f91915e407e021f95a8f3c38;p=platform%2Fframework%2Fweb%2Fcrosswalk-tizen.git

Do not use did-finish-load to detect whether WebContents is ready

The WebContents JS object can be created way later after the C++ object
gets created.
---

diff --git a/atom/browser/api/lib/web-contents.coffee b/atom/browser/api/lib/web-contents.coffee
index 1bb82de..3a2abfb 100644
--- a/atom/browser/api/lib/web-contents.coffee
+++ b/atom/browser/api/lib/web-contents.coffee
@@ -44,10 +44,8 @@ wrapWebContents = (webContents) ->
 
   # Make sure webContents.executeJavaScript would run the code only when the
   # web contents has been loaded.
-  webContents.loaded = false
-  webContents.once 'did-finish-load', -> @loaded = true
   webContents.executeJavaScript = (code, hasUserGesture=false) ->
-    if @loaded
+    if @getUrl() and not @isLoading()
       @_executeJavaScript code, hasUserGesture
     else
       webContents.once 'did-finish-load', @_executeJavaScript.bind(this, code, hasUserGesture)