merge changes before version 0.1

1 files changed, 5 insertions, 3 deletions

diff --git a/content/page_actions.js b/content/page_actions.js
index 3799afd..8057541 100644
--- a/content/page_actions.js
+++ b/content/page_actions.js
@@ -42,7 +42,7 @@ function handle_message(message)
     }
 }
 
-function document_loaded(event)
+function document_ready(event)
 {
     loaded = true;
 
@@ -66,13 +66,15 @@ function add_script(script_text)
     report_script(script_text);
 }
 
-function handle_page_actions(script_nonce, policy_received_cb) {
+function handle_page_actions(script_nonce, policy_received_cb,
+			     doc_ready_promise) {
     policy_received_callback = policy_received_cb;
     url = document.URL;
     is_html = /html/.test(document.contentType);
     report_content_type(document.contentType);
 
-    document.addEventListener("DOMContentLoaded", document_loaded);
+    doc_ready_promise.then(document_ready);
+
     port = browser.runtime.connect({name : CONNECTION_TYPE.PAGE_ACTIONS});
     port.onMessage.addListener(handle_message);
     port.postMessage({url});