Renamed firefox driver to firefox-xuy, firefox-sdk to firefox. FF driver now works with new windows

drivers/firefox/lib/driver.js

@@ -6,8 +6,6 @@
 		main = require('wappalyzer'),
 		w = main.wappalyzer,
 		mediator = Cc['@mozilla.org/appshell/window-mediator;1'].getService(Ci.nsIWindowMediator),
-		doc = mediator.getMostRecentWindow('navigator:browser').document,
-		urlBar = doc.getElementById('urlbar-icons'),
 		tabCache = {},
 		headersCache = {},
 		categoryNames = {},
@@ -21,7 +19,9 @@
 		addIcon,
 		removeIcons,
 		createPanel,
-		createWidget;
+		createWidget,
+		getUrlBar,
+		getDocument;
 
 	initTab = function(tab) {
 		tabCache[tab.id] = { count: 0, appsDetected: [] };
@@ -65,10 +65,9 @@
 
 	addIcon = function(url) {
 		var
-			icon = doc.createElement('image'),
+			icon = getDocument().createElement('image'),
 			show = true;
 
-
 		icon.setAttribute('src',    data.url(url));
 		icon.setAttribute('class',  'wappalyzer-icon');
 		icon.setAttribute('width',  '16');
@@ -97,7 +96,7 @@
 			}
 		}, false);
 
-		urlBar.appendChild(icon);
+		getUrlBar().appendChild(icon);
 
 		return icon;
 	};
@@ -106,10 +105,10 @@
 		var icons;
 
 		do {
-			icons = urlBar.getElementsByClassName('wappalyzer-icon');
+			icons = getUrlBar().getElementsByClassName('wappalyzer-icon');
 
 			if ( icons.length ) {
-				urlBar.removeChild(icons[0]);
+				getUrlBar().removeChild(icons[0]);
 			}
 		} while ( icons.length );
 	};
@@ -143,6 +142,14 @@
 		});
 	}
 
+	getUrlBar = function() {
+		return getDocument().getElementById('urlbar-icons');
+	}
+
+	getDocument = function() {
+		return mediator.getMostRecentWindow('navigator:browser').document;
+	}
+
 	w.driver = {
 		/**
 		 * Log messages to console
@@ -157,6 +164,8 @@
 		init: function(callback) {
 			var json = JSON.parse(data.load('apps.json'));
 
+			console.log('xxxx');
+
 			if ( sp.prefs.urlbar ) {
 				createPanel();
 			} else {

links.sh

@@ -1,12 +1,12 @@
 #!/bin/sh
 
-ln -f share/images/icons/*.png    drivers/firefox/skin/images/icons
+ln -f share/images/icons/*.png    drivers/firefox-xul/skin/images/icons
-ln -f share/apps.json             drivers/firefox/content
+ln -f share/apps.json             drivers/firefox-xul/content
-ln -f share/js/wappalyzer.js      drivers/firefox/content/js
+ln -f share/js/wappalyzer.js      drivers/firefox-xul/content/js
 
-ln -f share/images/icons/*.png    drivers/firefox-sdk/data/images/icons
+ln -f share/images/icons/*.png    drivers/firefox/data/images/icons
-ln -f share/apps.json             drivers/firefox-sdk/data
+ln -f share/apps.json             drivers/firefox/data
-ln -f share/js/wappalyzer.js      drivers/firefox-sdk/lib
+ln -f share/js/wappalyzer.js      drivers/firefox/lib
 
 ln -f share/images/icons/*.png    drivers/chrome/images/icons
 ln -f share/apps.json             drivers/chrome

package.cmd

@@ -53,8 +53,8 @@ cd drivers\chrome&&%zip% a -tzip -mx9 ..\..\wappalyzer-chrome.zip *
 cd..\..
 
 ::Pack Firefox extension
-cd drivers\firefox&&%zip% a -tzip -mx9 ..\..\wappalyzer-firefox.xpi *
+::cd drivers\firefox&&%zip% a -tzip -mx9 ..\..\wappalyzer-firefox.xpi *
-cd..\..
+::cd..\..
 
 
 :end

package.sh

@@ -7,4 +7,4 @@ path=`pwd`
 rm -f wappalyzer-chrome.zip wappalyzer-firefox.xpi
 
 cd $path/drivers/chrome  && zip -r $path/wappalyzer-chrome.zip  .
-cd $path/drivers/firefox && zip -r $path/wappalyzer-firefox.xpi .
+#cd $path/drivers/firefox && zip -r $path/wappalyzer-firefox.xpi .