From 36a0ac90259877e400f0b3c86435b5b66037fc25 Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sun, 23 Aug 2015 14:24:43 +1000
Subject: [PATCH] Replaced use of deprecated widget API with ui. Fixed issue of
 Wappalyzer not working in Firefox toolbar.

---
 src/drivers/firefox/images/icon32.png     | Bin 0 -> 1899 bytes
 src/drivers/firefox/images/icon32_hot.png | Bin 0 -> 1629 bytes
 src/drivers/firefox/lib/driver.js         |  68 +++++++++++++---------
 3 files changed, 40 insertions(+), 28 deletions(-)
 create mode 100644 src/drivers/firefox/images/icon32.png
 create mode 100644 src/drivers/firefox/images/icon32_hot.png

diff --git a/src/drivers/firefox/images/icon32.png b/src/drivers/firefox/images/icon32.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a9f9fe98327da1b731d3ec64f8ff08fb9fd4046
GIT binary patch
literal 1899
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

literal 0
HcmV?d00001

diff --git a/src/drivers/firefox/images/icon32_hot.png b/src/drivers/firefox/images/icon32_hot.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c0cd90caa5d847a3c59b5ade1ba85ff3579048e
GIT binary patch
literal 1629
zcmV-j2BP_iP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U0~)0sz<5YkU9z1?ove
zK~z}7otJBfRaF$ne{1h^W}4I-jb6ShC?R^Pl$AL|_OR$d*vrZYst-|7^r^lDeKzQe
zJs>m;q7P;!WiN>!i;|S6q{tppI%Ce<=Am=%J!h{z?7i>V_s&#P2M+hV_FDh7*8jiO
zzQPm_{cQ&__Zolw!R3po58Z()*MQEzX0MUY+$gI){SIKGQ`Q-olHGs&N<Y31S^18?
z{_u(mXbj$m7I&iM$&*{N2a#+e-KTAkE8qVGK)-khS@y!z0o1>|hwi1XdZ+I#TSj^8
zZp5vlY|iv61QalUYe7v+ssAzgelRc5GjEghz5Dw=0%%*l^Wv3SjIEQhyaUP}3{V1T
zO5*|zHzJ@48Xg+_wT2JHey^E*S!XZbU@v-cWFmkMmaIbSYr)-xmN_ETYfT(TaF8Mv
zz(q#^grreLU@m-<eU8{o94R)*?ca`yez^KRy8B;2>u{{_P9%vYdXY5h@M{#DBza8Y
zQoJ3gYzfe8K<^y%%+*MqU7a!BJ<id&&{c<-;~--&b`&%qHo>+_>TUv<Qowf5DQ3pe
z!HW_WtUwoD0%Lz7zkLa%%+4^!52C|R<}jE+HVsb9;nX=W@FNWF2a`h<4BCVMRw^Et
zq~^rzG-3Kl=;_zN3G<PGy~w`ppm|u+Gms(8;TBpG3?6YX(hu{OqG#WL^zVgVKLNE=
z{4n03Nm3r8)h5hej?P;S$3~DtyP<y%K3$nlk1DvHA<_5mU(ER7?-22*BM@W!{df&d
zU4$;a7{(4DKktBJqhPYC?jq1^!t`0_!c{P95%T+2@W(!oF6f#bh^nD9fym~Bd7|$<
zcnaf(4*AT92N(%vfU*e`P&A=;7JAllm}Ze*cf!Cv4`9v`bioR!H;{w7U}OkvNHdu)
zp#~P0!L};&KHnueP|Nx3-i9x$KwM`4aZnUcHhlJs@y~Mu3ok_Hodk9o(*FY-{sv0p
zneQBwLAJIFY~~F*s(v8`S@MQta&m7|-@3VyjZ)QFrJ}rZ{<Pu!kGqirCCspp9|z8W
zmQXmaATgks|BW0`l0Kmg0wbyh6H(eIH{-KlGS6t7Pho6I$7kN)c*DPQsU!^;>rYGw
zChZrd7N`s$!!2p0{X_#9Nly}EF{;#gY+Tl_RS9Q;O%>2T695did2Ry{A`w&Fr`=Ek
zq1ybL06aKP!8wV~|EK_{8EtdwXm7(YofCR-=lqU+C}hi+iP@6SzSSO1GN3~fY)hIp
z@x&0@K82Kt*BTs)^~9WPf;s><lw?3^o}CGb&YH&N)P^)n!nWyXJlLpvszKONf|vYY
z0>IT;8l7xWY`xe@R<2_t$8RK_iJdsa%CuaXZ~!|xX-&({EEte1=@Xr-HC34+S)+58
zC`%PpJyHR1#h`a69SWEv3&w<@l=O7%P>Yx<D@DiF&4sOj%LZGGNU?*W&19NM6=j)-
zH7Y_9cDoRjmGC^gk4h3vqNkFq(@F)RMa}CubUM_xRdq>(3CXPWQgSg%fgf?_q|UE*
z9n&xRa7r`ngmUYfFXHmsaC+1al0*U;X18`IBG2Q7uzD6Vqe+L1;kSYjrL>QAt=PP0
z(rvlEe*LrL<|$f|Ps$Oep*S!Ox*L!=KW<ItGo#`sVdqgO6taHwnc9;xKHBM0ZB@?K
zpM%`K{b`Pj%%b6Tc#S8mwiQK?q7BW-gsE3D(Rry*ciTAVW=r3eC#FBp+ty*)0LbIt
zM1s_0&Gu_`Trb7xPrins;H|VKL&iyHuj#f-p;7K;xOtwe+<GI}App5^3x5ls1>~WR
zJ@|7M?UGyGK0_NkjMLKZ<1`_a1Jj-C6Y+b7LJ#Xmd4pW>)>6)&`!#^9+4A528>Yw5
z16SGJ)jjLUc*O4?1*X-Z`?#vXI9Jf*5$W5yL3J}CYyZ`*nJR$ZzMfKU+4g92NEcA*
zE}X0WemRA@J|~xL&82Va20y>nPRZ_+0m#~I0OUCb<fd(x(lFOjy8RTgnVOs^eQ!R_
b|2X~v-bK+BlMZKr00000NkvXXu0mjf*cT2C

literal 0
HcmV?d00001

diff --git a/src/drivers/firefox/lib/driver.js b/src/drivers/firefox/lib/driver.js
index df4abf254..5348d7d88 100644
--- a/src/drivers/firefox/lib/driver.js
+++ b/src/drivers/firefox/lib/driver.js
@@ -10,8 +10,8 @@
 		Window,
 		Tab,
 		Panel,
-		Widget,
-		widget, // Keep track of a global widget instance. A widget per window does not work.
+		Button,
+		button,
 		UrlBar;
 
 	exports.main = function(options, callbacks) {
@@ -40,21 +40,28 @@
 		this.window = win;
 		this.tabs   = {};
 		this.urlBar = null;
-		this.widget = null;
+
+		if ( button ) {
+			button.destroy();
+		}
 
 		if ( require('sdk/simple-prefs').prefs.urlbar ) {
 			this.urlBar = new UrlBar(this.window);
 		} else {
-			this.widget = widget || ( widget = new Widget() );
+			button = new Button();
 		}
 
 		require('sdk/simple-prefs').on('urlbar', function() {
 			self.destroy();
 
+			if ( button ) {
+				button.destroy();
+			}
+
 			if ( require('sdk/simple-prefs').prefs.urlbar ) {
 				self.urlBar = new UrlBar(this.window);
 			} else {
-				self.widget = widget || ( widget = new Widget() );
+				button = new Button();
 			}
 
 			self.displayApps();
@@ -120,8 +127,8 @@
 			this.urlBar.panel.get().port.emit('displayApps', message);
 		}
 
-		if ( this.widget ) {
-			this.widget.setIcon();
+		if ( button ) {
+			button.setIcon();
 
 			if ( count ) {
 				var
@@ -133,7 +140,7 @@
 					for ( appName in w.detected[url] ) {
 						w.apps[appName].cats.forEach(function(cat) {
 							if ( cat == match && !found ) {
-								self.widget.setIcon(appName);
+								button.setIcon(appName);
 
 								found = true;
 							}
@@ -142,7 +149,7 @@
 				});
 			}
 
-			this.widget.panel.get().port.emit('displayApps', message);
+			button.panel.get().port.emit('displayApps', message);
 		}
 	};
 
@@ -152,12 +159,6 @@
 
 			this.urlBar = null;
 		}
-
-		if ( this.widget ) {
-			this.widget.destroy();
-
-			this.widget = null;
-		}
 	};
 
 	Tab = function(tab) {
@@ -190,7 +191,12 @@
 			height: 50,
 			contentURL: require('sdk/self').data.url('panel.html'),
 			contentScriptFile: require('sdk/self').data.url('js/panel.js'),
-			position: { right: 30, top: 30 }
+			position: { right: 30, top: 30 },
+			onHide: function() {
+				if ( button ) {
+					button.get().state('window', { checked: false });
+				}
+			}
 		});
 
 		this.panel.port.on('resize', function(height) {
@@ -212,31 +218,37 @@
 		this.panel.destroy();
 	};
 
-	Widget = function() {
+	Button = function() {
+		var self = this;
+
 		this.panel = new Panel();
 
-		this.widget = require('sdk/widget').Widget({
+		this.button = require('sdk/ui/button/toggle').ToggleButton({
 			id: 'wappalyzer',
 			label: 'Wappalyzer',
-			contentURL: require('sdk/self').data.url('images/icon32.png'),
-			panel: this.panel.get()
+			icon: './images/icon32.png',
+			onChange: function(state) {
+				if ( state.checked ) {
+					self.panel.get().show({ position: self.button });
+				}
+			}
 		});
 	};
 
-	Widget.prototype.setIcon = function(appName) {
-		var url = typeof appName === 'undefined' ? 'images/icon32_hot.png' : 'images/icons/' + appName + '.png';
+	Button.prototype.setIcon = function(appName) {
+		var url = typeof appName === 'undefined' ? './images/icon32.png' : './images/icons/' + appName + '.png';
 
-		this.get().contentURL = require('sdk/self').data.url(url);
+		this.button.icon = url;
 	};
 
-	Widget.prototype.get = function() {
-		return this.widget;
+	Button.prototype.get = function() {
+		return this.button;
 	};
 
-	Widget.prototype.destroy = function() {
+	Button.prototype.destroy = function() {
 		this.panel.destroy();
 
-		this.widget.destroy();
+		this.button.destroy();
 	};
 
 	UrlBar = function(window) {
@@ -249,7 +261,7 @@
 		}
 
 		// Can't get document from sdk/windows. Use active window instead.
-		// This breaks switching between URL bar and widget with multiple windows open
+		// This breaks switching between URL bar and button with multiple windows open
 		this.document = Cc['@mozilla.org/appshell/window-mediator;1'].getService(Ci.nsIWindowMediator)
 			.getMostRecentWindow('navigator:browser').document;