using a much simpler method to inject the dynamic <base>

brianking · Jun 10, 2012 · 415fbef · 415fbef
1 parent b93cc3e
commit 415fbef
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 48 deletions.
diff --git a/data/remo-start.html b/data/remo-start.html
@@ -10,23 +10,20 @@
       Mozilla Reps Companion
     </title>
 
+    <base href="{ page.baseurl }"/>
+    <link href="remo-start.css" rel="stylesheet"/>
+
     <script>
         function openAddonsManager() {
             var evt = document.createEvent("Events");
             evt.initEvent("RemoOpenAddonsManager", true, false);
             document.dispatchEvent(evt);
         }
-        function startAboutReps() {
-            var evt = document.createEvent("Events");
-            evt.initEvent("StartAboutReps", true, false);
-            document.dispatchEvent(evt);
-        }
     </script>
 
 </head>
 
 <body>
-    <script>startAboutReps();</script>
     <!-- Wrapper for background -->
     <div id="wrapper">
 

diff --git a/data/remo-start.js b/data/remo-start.js
diff --git a/lib/main.js b/lib/main.js
@@ -67,17 +67,6 @@ pageMod.PageMod(
     }
 });
 
-pageMod.PageMod(
-{
-    include: [data.url("remo-start.html"), "about:reps"],
-    contentScriptWhen: 'start',
-    contentScriptFile: data.url("remo-start.js"),
-    onAttach: function(worker)
-    {
-        worker.port.emit('baseURL', self.data.url(""));
-    }
-});
-
 
 /* end about:reps */
 
@@ -129,7 +118,9 @@ exports.main = function(options, callback)
      See bugs 759190 and 760233 */
   protocol.about('reps', {
     onRequest: function(request, response) {
-      response.uri = data.url("remo-start.html");
+      response.contentType = "text/html";
+      response.end(data.load("remo-start.html").replace(/\{\s*page\.baseurl\s*\}/, self.data.url("")));
+      return;
     }
   }).register();
 

diff --git a/package.json b/package.json
@@ -15,5 +15,5 @@
     "icon": "data/Remo48.png",
     "icon64": "data/Remo64.png",
     "homepage": "https://reps.mozilla.org/",
-    "dependencies": ["api-utils", "addon-kit", "vold-utils", "protocol"]
+    "dependencies": ["api-utils", "addon-kit", "protocol"]
 }