[evolution/wip/mcrha/webkit-jsc-api] Fixes around Evo.InitializeAndPostContentLoaded()



commit 6bde93470b82b694a9b42f1c672592a466aeab26
Author: Milan Crha <mcrha redhat com>
Date:   Wed Oct 2 15:32:07 2019 +0200

    Fixes around Evo.InitializeAndPostContentLoaded()

 src/web-extensions/ext-utils.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/src/web-extensions/ext-utils.js b/src/web-extensions/ext-utils.js
index a1183e2224..de226c4d8d 100644
--- a/src/web-extensions/ext-utils.js
+++ b/src/web-extensions/ext-utils.js
@@ -256,7 +256,7 @@ Evo.SetDocumentContent = function(content)
 {
        document.documentElement.innerHTML = content;
 
-       Evo.Initialize("");
+       Evo.Initialize(null);
        window.webkit.messageHandlers.contentLoaded.postMessage("");
 }
 
@@ -576,7 +576,10 @@ Evo.Initialize = function(elem)
        elems = doc.getElementsByTagName("iframe");
 
        for (ii = 0; ii < elems.length; ii++) {
-               elems[ii].onload = function() { Evo.InitializeAndPostContentLoaded(this) };
+               elems[ii].onload = function() { Evo.InitializeAndPostContentLoaded(this); };
+
+               if (elems[ii].contentDocument.body && elems[ii].contentDocument.body.childElementCount > 0)
+                       Evo.InitializeAndPostContentLoaded(elems[ii]);
        }
 
        if (!doc.body.hasAttribute("class"))
@@ -602,6 +605,8 @@ Evo.InitializeAndPostContentLoaded = function(elem)
 {
        var iframe_id = "";
 
+       if (elem && /*elem instanceof HTMLIFrameElement*/ elem.tagName.toUpperCase() == "IFRAME")
+               iframe_id = elem.id;
        if (elem && elem.ownerDocument && elem.ownerDocument.defaultView.frameElement)
                iframe_id = elem.ownerDocument.defaultView.frameElement.id;
        else if (window.frameElement)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]