From 05f174ab973d548e21f214ad86cae6cdd23aaac3 Mon Sep 17 00:00:00 2001
From: Deathamns <deathamns@gmail.com>
Date: Sun, 7 Dec 2014 20:51:49 +0100
Subject: [PATCH] Firefox: add basic blocking + some fixes

---
 platform/firefox/frameScript.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform/firefox/frameScript.js b/platform/firefox/frameScript.js
index a27022f..4d4225b 100644
--- a/platform/firefox/frameScript.js
+++ b/platform/firefox/frameScript.js
@@ -24,7 +24,7 @@ let _removeMessageListener = function(id) {
     delete listeners[id];
 };
 
-addMessageListener('µBlock:broadcast', function(msg) {
+addMessageListener(appName + ':broadcast', function(msg) {
     for (let id in listeners) {
         listeners[id](msg);
     }
@@ -63,7 +63,12 @@ let observer = {
         lss(contentBaseURI + 'vapi-client.js', win);
         lss(contentBaseURI + 'contentscript-start.js', win);
 
-        if (win.document.readyState === 'loading') {
+        let readyState = win.document.readyState;
+
+		if (readyState === "interactive" || readyState === "complete") {
+            lss(contentBaseURI + 'contentscript-end.js', win);
+        }
+        else {
             let docReady = function(e) {
                 this.removeEventListener(e.type, docReady, true);
                 lss(contentBaseURI + 'contentscript-end.js', win);
@@ -71,9 +76,6 @@ let observer = {
 
             win.document.addEventListener('DOMContentLoaded', docReady, true);
         }
-        else {
-            lss(contentBaseURI + 'contentscript-end.js', win);
-        }
     }
 };