dispatch js event to all of browsers and frames

hibiyasleep · Dec 3, 2016 · aca5b59 · aca5b59
1 parent 6efaa7f
commit aca5b59
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/HtmlRenderer/Renderer.cs b/HtmlRenderer/Renderer.cs
@@ -306,6 +306,18 @@ public static void Shutdown()
                 CefRuntime.Shutdown();
             }
         }
+
+        public void ExecuteScript(string script)
+        {
+            this.Browsers.ForEach((b) =>
+            {
+                foreach (var frameId in b.GetFrameIdentifiers())
+                {
+                    var frame = b.GetFrame(frameId);
+                    frame.ExecuteJavaScript(script, null, 0);
+                }
+            });
+        }
     }
 
     public class BrowserErrorEventArgs : EventArgs

diff --git a/OverlayPlugin.Core/OverlayBase.cs b/OverlayPlugin.Core/OverlayBase.cs
@@ -362,7 +362,7 @@ private void NotifyOverlayState()
                 this.Overlay.Renderer != null &&
                 this.Overlay.Renderer.Browser != null)
             {
-                this.Overlay.Renderer.Browser.GetMainFrame().ExecuteJavaScript(updateScript, null, 0);
+                this.Overlay.Renderer.ExecuteScript(updateScript);
             }
         }
 
@@ -376,11 +376,7 @@ public void SendMessage(string message)
                 this.Overlay.Renderer != null &&
                 this.Overlay.Renderer.Browser != null)
             {
-                foreach (var frameId in this.Overlay.Renderer.Browser.GetFrameIdentifiers())
-                {
-                    var frame = this.Overlay.Renderer.Browser.GetFrame(frameId);
-                    frame.ExecuteJavaScript(script, null, 0);
-                }
+                this.Overlay.Renderer.ExecuteScript(script);
             }
         }
     }

diff --git a/OverlayPlugin.Core/Overlays/LabelOverlay.cs b/OverlayPlugin.Core/Overlays/LabelOverlay.cs
@@ -39,7 +39,7 @@ private void UpdateOverlayText()
                     this.Overlay.Renderer != null &&
                     this.Overlay.Renderer.Browser != null)
                 {
-                    this.Overlay.Renderer.Browser.GetMainFrame().ExecuteJavaScript(updateScript, null, 0);
+                    this.Overlay.Renderer.ExecuteScript(updateScript);
                 }
                 else
                 {

diff --git a/OverlayPlugin.Core/Overlays/MiniParseOverlay.cs b/OverlayPlugin.Core/Overlays/MiniParseOverlay.cs
@@ -55,13 +55,14 @@ protected override void Update()
                     this.Overlay.Renderer != null &&
                     this.Overlay.Renderer.Browser != null)
                 {
-                    this.Overlay.Renderer.Browser.GetMainFrame().ExecuteJavaScript(updateScript, null, 0);
+                    this.Overlay.Renderer.ExecuteScript(updateScript);
                 }
             }
         }
 
         private string CreateEventDispatcherScript()
         {
+            // why?
             return "var ActXiv = " + this.CreateJsonData() + ";\n" +
                    "document.dispatchEvent(new CustomEvent('onOverlayDataUpdate', { detail: ActXiv }));";
         }
@@ -75,7 +76,7 @@ internal string CreateJsonData()
 
             if (!CheckIsActReady())
             {
-                return "";
+                return "{}";
             }
 
 #if DEBUG

diff --git a/OverlayPlugin.Core/Overlays/SpellTimerOverlay.cs b/OverlayPlugin.Core/Overlays/SpellTimerOverlay.cs
@@ -63,7 +63,7 @@ protected override void Update()
                     this.Overlay.Renderer != null &&
                     this.Overlay.Renderer.Browser != null)
                 {
-                    this.Overlay.Renderer.Browser.GetMainFrame().ExecuteJavaScript(updateScript, null, 0);
+                    this.Overlay.Renderer.ExecuteScript(updateScript);
                 }
 
             }