Issue 1091 - Implement a better templating approach for Element Hiding Helper

lib/main.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {Prefs} = require("prefs");
 let {WindowObserver} = require("windowObserver");
@@ skipping 15 matching lines @@
 // Use random marker class
 let elementMarkerClass = null;
 {
   let rnd = [];
   let offset = "a".charCodeAt(0);
   for (let i = 0; i < 20; i++)
     rnd.push(offset + Math.random() * 26);
 
   elementMarkerClass = String.fromCharCode.apply(String, rnd);
 }
+exports.elementMarkerClass = elementMarkerClass;
 
 // Load CSS asynchronously
 let request = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Ci.nsIXMLHttpRequest);
 request.open("GET", "chrome://elemhidehelper/content/elementmarker.css");
 request.overrideMimeType("text/plain");
 request.addEventListener("load", function(event)
 {
   if (onShutdown.done)
     return;
 
@@ skipping 22 matching lines @@
     {
       let type = window.document.documentElement.getAttribute("windowtype");
       if (!(type in knownWindowTypes) || window._ehhWrapper)
         return;
 
       window.document.documentElement.appendChild(overlay.cloneNode(true));
 
       let style = window.document.createProcessingInstruction("xml-stylesheet", 'class="elemhidehelper-node" href="chrome://elemhidehelper/skin/overlay.css" type="text/css"');
       window.document.insertBefore(style, window.document.firstChild);
 
-      window._ehhWrapper = new WindowWrapper(window, elementMarkerClass);
+      window._ehhWrapper = new WindowWrapper(window);
     },
 
     removeFromWindow: function(window)
     {
       if (!window._ehhWrapper)
         return;
 
       window._ehhWrapper.shutdown();
       delete window._ehhWrapper;
 
       let element = window.document.getElementById(overlay.getAttribute("id"));
       if (element)
         element.parentNode.removeChild(element);
 
       for (let child = window.document.firstChild; child; child = child.nextSibling)
         if (child.nodeType == child.PROCESSING_INSTRUCTION_NODE && child.data.indexOf("elemhidehelper-node") >= 0)
           child.parentNode.removeChild(child);
     }
   });
 }, false);
 request.send(null);