From 1967f9ba6acac4268d2d4b08a18f52a0cbbbeb5d Mon Sep 17 00:00:00 2001
From: Will Bamberg <wbamberg@mozilla.com>
Date: Fri, 19 Feb 2016 13:30:32 -0800
Subject: [PATCH] move listener definitions above references

---
 open-my-page-button/background.js             | 29 ++++++++++---------
 page-to-extension-messaging/content-script.js | 14 ++++-----
 user-agent-rewriter/background.js             | 20 ++++++-------
 3 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/open-my-page-button/background.js b/open-my-page-button/background.js
index d627e4a..216ea86 100644
--- a/open-my-page-button/background.js
+++ b/open-my-page-button/background.js
@@ -1,15 +1,16 @@
- /*
- Add openMyPage() as a listener to clicks on the browser action.
- */
- chrome.browserAction.onClicked.addListener(openMyPage);
- 
- /*
- Open a new tab, and load "my-page.html" into it.
- */
- function openMyPage() {
-   console.log("injecting");
-    chrome.tabs.create({
-      "url": chrome.extension.getURL("my-page.html")
-    }); 
- }
+/*
+Open a new tab, and load "my-page.html" into it.
+*/
+function openMyPage() {
+  console.log("injecting");
+   chrome.tabs.create({
+     "url": chrome.extension.getURL("my-page.html")
+   });
+}
+
+
+/*
+Add openMyPage() as a listener to clicks on the browser action.
+*/
+chrome.browserAction.onClicked.addListener(openMyPage);
  
diff --git a/page-to-extension-messaging/content-script.js b/page-to-extension-messaging/content-script.js
index 1323af1..50cb715 100644
--- a/page-to-extension-messaging/content-script.js
+++ b/page-to-extension-messaging/content-script.js
@@ -10,13 +10,6 @@ window.addEventListener("message", function(event) {
   }
 });
 
-/*
-Add messagePageScript() as a listener to click events on
-the "from-content-script" element.
-*/
-var fromContentScript = document.getElementById("from-content-script");
-fromContentScript.addEventListener("click", messagePageScript);
-
 /*
 Send a message to the page script.
 */
@@ -26,3 +19,10 @@ function messagePageScript() {
     message: "Message from the content script"
   }, "https://mdn.github.io");
 }
+
+/*
+Add messagePageScript() as a listener to click events on
+the "from-content-script" element.
+*/
+var fromContentScript = document.getElementById("from-content-script");
+fromContentScript.addEventListener("click", messagePageScript);
diff --git a/user-agent-rewriter/background.js b/user-agent-rewriter/background.js
index 40255f6..4b2e347 100644
--- a/user-agent-rewriter/background.js
+++ b/user-agent-rewriter/background.js
@@ -19,16 +19,6 @@ Initialize the UA to Firefox 41.
 */
 var ua = uaStrings["Firefox 41"];
 
-/*
-Add rewriteUserAgentHeader as a listener to onBeforeSendHeaders,
-only for the target page.
-
-Make it "blocking" so we can modify the headers.
-*/
-chrome.webRequest.onBeforeSendHeaders.addListener(rewriteUserAgentHeader,
-                                          {urls: [targetPage]},
-                                          ["blocking", "requestHeaders"]);
-
 /*
 Rewrite the User-Agent header to "ua".
 */
@@ -41,6 +31,16 @@ function rewriteUserAgentHeader(e) {
   return {requestHeaders: e.requestHeaders};
 }
 
+/*
+Add rewriteUserAgentHeader as a listener to onBeforeSendHeaders,
+only for the target page.
+
+Make it "blocking" so we can modify the headers.
+*/
+chrome.webRequest.onBeforeSendHeaders.addListener(rewriteUserAgentHeader,
+                                          {urls: [targetPage]},
+                                          ["blocking", "requestHeaders"]);
+
 /*
 Update ua to a new value, mapped from the uaString parameter.
 */