Use special magic for opening windows to avoid Torbutton's control-freakery

pde · pde · commit 0d75f7606bba · 2011-07-01T13:20:13.000-07:00
diff --git a/src/chrome/content/about.xul b/src/chrome/content/about.xul
@@ -13,6 +13,8 @@
   height="550"
   align="center">
 
+  <script type="application/x-javascript" 
+           src="chrome://https-everywhere/content/preferences.js"/>
   <vbox>
     <label style="text-align:center; font-weight:bold; font-size:22px;">HTTPS Everywhere</label>
     <label style="text-align:center; font-size:18px; margin-bottom:10px;">Encrypt the Web! Automatically use HTTPS security on many sites.</label>
@@ -48,14 +50,14 @@
         style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
         onmouseover="event.target.style.cursor='pointer'"
         onmouseout="event.target.style.cursor='default'"
-        onclick="window.open('https://www.torproject.org/donate/donate.html.en')"/>
+        onclick="window_opener('https://www.torproject.org/donate/donate.html.en')"/>
       or
       <label id="donate link2"
         value="Donating to EFF"
         style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
         onmouseover="event.target.style.cursor='pointer'"
         onmouseout="event.target.style.cursor='default'"
-        onclick="window.open('https://www.eff.org/donate')"/>
+        onclick="window_opener('https://www.eff.org/donate')"/>
     </label>
   </vbox>
 </dialog>
diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
@@ -1,4 +1,5 @@
 const CC = Components.classes;
+const CI = Components.interfaces;
 VERB=1;
 DBUG=2;
 INFO=3;
@@ -111,3 +112,10 @@ function https_prefs_init(doc) {
 
   st.view = treeView;
 }
+
+function window_opener(uri, opts) {
+  // we don't use window.open, because we need to work around TorButton's state control
+  CC['@mozilla.org/appshell/window-mediator;1'].getService(CI.nsIWindowMediator)
+                                               .getMostRecentWindow('navigator:browser')
+                                               .open(uri, '','centerscreen' );
+}
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
@@ -40,6 +40,6 @@
           style="color: blue; cursor:hand; text-decoration:underline;"
           onmouseover="event.target.style.cursor='pointer'"
           onmouseout="event.target.style.cursor='default'"
-          onclick="window.open('https://eff.org/https-everywhere/rulesets')"/>.
+          onclick="window_opener('https://eff.org/https-everywhere/rulesets')"/>.
     </vbox>
 </dialog>
diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js
@@ -91,3 +91,10 @@ function open_in_tab(url) {
   var recentWindow = wm.getMostRecentWindow("navigator:browser");
   recentWindow.delayedOpenTab(url, null, null, null, null);
 }
+
+function chrome_opener(uri, opts) {
+  // we don't use window.open, because we need to work around TorButton's state control
+  CC['@mozilla.org/appshell/window-mediator;1'].getService(CI.nsIWindowMediator)
+                                               .getMostRecentWindow('navigator:browser')
+                                               .open(uri,'', 'chrome,centerscreen' );
+}
diff --git a/src/chrome/content/toolbar_button.xul b/src/chrome/content/toolbar_button.xul
@@ -21,15 +21,19 @@
             label="HTTPS Everywhere"
             context="https-everywhere-context-menu"
             buttonstyle="pictures"
-            type="menu" >
+            type="menu">
 
             <menupopup id="https-everywhere-context" onpopupshowing="show_applicable_list()"></menupopup>
         </toolbarbutton>
     </toolbarpalette>
     <commandset>
-        <command id="https-everywhere-menuitem-preferences" oncommand="window.open('chrome://https-everywhere/content/preferences.xul', '', 'chrome,centerscreen');" />
-        <command id="https-everywhere-menuitem-about" oncommand="window.open('chrome://https-everywhere/content/about.xul', '', 'chrome,centerscreen');" />
-        <command id="https-everywhere-menuitem-donate-eff" oncommand="open_in_tab('https://www.eff.org/donate');" />
-        <command id="https-everywhere-menuitem-donate-tor" oncommand="open_in_tab('https://www.torproject.org/donate');" />
+        <command id="https-everywhere-menuitem-preferences"
+          oncommand="chrome_opener('chrome://https-everywhere/content/preferences.xul');" />
+        <command id="https-everywhere-menuitem-about"
+          oncommand="chrome_opener('chrome://https-everywhere/content/about.xul');" />
+        <command id="https-everywhere-menuitem-donate-eff" 
+          oncommand="open_in_tab('https://www.eff.org/donate');" />
+        <command id="https-everywhere-menuitem-donate-tor" 
+          oncommand="open_in_tab('https://www.torproject.org/donate');" />
     </commandset>
 </overlay>
