Add features to downgrade-to-stable popup

diracdeltas · diracdeltas · commit 4b9e30b83583 · 2013-08-22T17:45:02.000-07:00
diff --git a/src/chrome/content/dev-popup.js b/src/chrome/content/dev-popup.js
@@ -0,0 +1,26 @@
+const CI = Components.interfaces;
+const CC = Components.classes;
+
+// LOG LEVELS ---
+VERB=1;
+DBUG=2;
+INFO=3;
+NOTE=4;
+WARN=5;
+
+HTTPSEverywhere = CC["@eff.org/https-everywhere;1"]
+                      .getService(Components.interfaces.nsISupports)
+                      .wrappedJSObject;
+
+function dev_popup_done() {
+//  HTTPSEverywhere.prefs.setBoolPref("dev_popup_shown", true);
+  window.close();
+}
+
+function download_stable() {
+  try {
+    HTTPSEverywhere.tab_opener("https://www.eff.org/files/https-everywhere-latest.xpi");
+  } catch(e) {
+    alert("OOPS! Automatic download failed; please go to https://www.eff.org/https-everywhere instead.");
+  }
+}
diff --git a/src/chrome/content/dev-popup.xul b/src/chrome/content/dev-popup.xul
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://https-everywhere/locale/https-everywhere.dtd">
+<window id="dev-popup-dialog" 
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
+  xmlns:html="http://www.w3.org/1999/xhtml" 
+  title="&https-everywhere.popup.title;" 
+  width="500" 
+  height="440" 
+  align="center"
+  onload="document.getElementById('keep-on-dev').focus()"
+  >
+    <image src="chrome://https-everywhere/skin/https-everywhere-banner.jpg" />
+    <script type="application/x-javascript" src="dev-popup.js" />
+    <label style="padding:25px;">&https-everywhere.popup.header;</label>
+
+    <commandgroup>
+      <command id="revert" oncommand="download_stable(); dev_popup_done()" />
+      <command id="keep" oncommand="dev_popup_done()" />
+    </commandgroup>
+
+    <vbox flex="1">
+      <separator class="thin"/>
+      <label>&https-everywhere.popup.paragraph1;</label>
+      <separator class="thin"/>
+      <label>&https-everywhere.popup.paragraph2;</label>
+      <spacer flex="1" />
+      <button id="revert-to-stable" label="&https-everywhere.popup.revert;"
+	      tabindex="2"
+	      accesskey="N" 
+	      command='revert' />
+      <spacer flex="1" />
+      <label>&https-everywhere.popup.paragraph3;</label>
+      <separator class="thin"/>
+      <button id="keep-on-dev" label="&https-everywhere.popup.keep;" 
+	      tabindex="1" 
+	      accesskey="y" 
+	      command='keep'/>
+    </vbox>
+</window>
diff --git a/src/chrome/content/observatory-popup.xul b/src/chrome/content/observatory-popup.xul
@@ -21,8 +21,7 @@
       <command id="more-info" 
                oncommand='popup_done() ; 
                window.open("chrome://https-everywhere/content/observatory-preferences.xul","obsprefs",
-               "chrome, centerscreen")'
-      />
+               "chrome, centerscreen")'/>
     </commandgroup>
 
     <vbox flex="1">
diff --git a/src/chrome/locale/en/https-everywhere.dtd b/src/chrome/locale/en/https-everywhere.dtd
@@ -35,3 +35,10 @@
 <!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
 
 
+<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
+<!ENTITY https-everywhere.popup.header  "Would you like to download the stable version of HTTPS Everywhere?">
+<!ENTITY https-everywhere.popup.paragraph1 "Oops. It appears that you were recently using the stable version of HTTPS Everywhere and are now on the development version. Perhaps we accidentally upgraded you to our development channel in our last release. However, we'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org.">
+<!ENTITY https-everywhere.popup.paragraph2 "If you would like to return to the stable channel, click below to download our latest stable version:">
+<!ENTITY https-everywhere.popup.paragraph3 "Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
+<!ENTITY https-everywhere.popup.keep "Keep me on the development version.">
+<!ENTITY https-everywhere.popup.revert "Download the latest stable release.">
diff --git a/src/chrome/skin/https-everywhere-banner.jpg b/src/chrome/skin/https-everywhere-banner.jpg
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -546,8 +546,7 @@ HTTPSEverywhere.prototype = {
       was_stable = false;
     }
     if (was_stable && !shown) {
-      this.prefs.setBoolPref("dev_popup_shown", true);
-      this.tab_opener("chrome://https-everywhere/content/observatory-popup.xul");
+      this.tab_opener("chrome://https-everywhere/content/dev-popup.xul");
     }
   },
 

Original file line number	Diff line number	Diff line change
`@@ -546,8 +546,7 @@ HTTPSEverywhere.prototype = {`
`546`	`546`	`was_stable = false;`
`547`	`547`	`}`
`548`	`548`	`if (was_stable && !shown) {`
`549`		`- this.prefs.setBoolPref("dev_popup_shown", true);`
`550`		`- this.tab_opener("chrome://https-everywhere/content/observatory-popup.xul");`
	`549`	`+ this.tab_opener("chrome://https-everywhere/content/dev-popup.xul");`
`551`	`550`	`}`
`552`	`551`	`},`
`553`	`552`