Make Tools->HTTPS Everywhere a clone of the context menu

pde · pde · commit 32baf58e6ed8 · 2011-07-08T15:07:54.000-07:00
diff --git a/src/chrome.manifest b/src/chrome.manifest
@@ -21,7 +21,3 @@ component {0f9ab521-986d-4ad8-9c1f-6934e195c15c} components/ssl-observatory.js
 contract @eff.org/ssl-observatory;1 {0f9ab521-986d-4ad8-9c1f-6934e195c15c}
 
 category profile-after-change SSLObservatory @eff.org/ssl-observatory;1
-
-overlay chrome://browser/content/browser.xul chrome://https-everywhere/content/browser-overlay.xul
-overlay chrome://navigator/content/navigatorOverlay.xul chrome://https-everywhere/content/browser-overlay.xul
-
diff --git a/src/chrome/content/code/ApplicableList.js b/src/chrome/content/code/ApplicableList.js
@@ -55,7 +55,7 @@ ApplicableList.prototype = {
       dst.setUserData(key, data, this.dom_handler);
   },
 
-  populate_menu: function(document) {
+  populate_menu: function(document, menupopup) {
 
     // The base URI of the dom tends to be loaded from some /other/
     // ApplicableList, so pretend we're loading it from here.
@@ -64,7 +64,7 @@ ApplicableList.prototype = {
     this.document = document;
    
     // get the menu popup
-    this.menupopup = document.getElementById('https-everywhere-context');
+    this.menupopup = menupopup;
 
     // empty it all of its menuitems
     while(this.menupopup.firstChild.tagName != "menuseparator") {
diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js
@@ -33,7 +33,16 @@ function https_everywhere_load() {
   } catch(e) { }
 }
 
-function show_applicable_list() {
+function stitch_context_menu() {
+  // the same menu appears both under Tools and via the toolbar button:
+  var menu = document.getElementById("https-everywhere-menu");
+  if (!menu.firstChild) {
+    var popup = document.getElementById("https-everywhere-context");
+    menu.appendChild(popup.cloneNode(true));
+  }
+}
+
+function show_applicable_list(menupopup) {
   var domWin = content.document.defaultView.top;
   if (!(domWin instanceof CI.nsIDOMWindow)) {
     alert(domWin + " is not an nsIDOMWindow");
@@ -49,7 +58,7 @@ function show_applicable_list() {
     // away.
     alist = new ApplicableList(HTTPSEverywhere.log, document, domWin);
   }
-  alist.populate_menu(document);
+  alist.populate_menu(document, menupopup);
 }
 
 function toggle_rule(rule_id) {
diff --git a/src/chrome/content/toolbar_button.xul b/src/chrome/content/toolbar_button.xul
@@ -8,10 +8,13 @@
 
 <overlay id="https-everywhere-button-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/x-javascript" src="chrome://https-everywhere/content/toolbar_button.js"/>
-  
-  <toolbar id="nav-bar">
-    <popup id="https-everywhere-context-menu"/>
-  </toolbar>
+
+  <!-- this works in Firefox, we need a Seamonkey version too... -->
+  <menupopup id="menu_ToolsPopup" onpopupshowing="stitch_context_menu()">
+    <menu id="https-everywhere-menu" label="&https-everywhere.about.ext_name;"> 
+      <!-- "https-everywhere-context" below gets .cloneNode()ed in here -->
+    </menu>
+  </menupopup>
 
   <toolbarpalette id="BrowserToolbarPalette">
     <toolbarbutton 
@@ -24,7 +27,7 @@
       buttonstyle="pictures"
       type="menu">
 
-      <menupopup id="https-everywhere-context" onpopupshowing="show_applicable_list()">
+      <menupopup id="https-everywhere-context" onpopupshowing="show_applicable_list(this)">
         <!-- entries will be written here by ApplicableList.populate_menu() -->
         <menuseparator />
         <menuitem label="&https-everywhere.menu.observatory;" command="https-everywhere-menuitem-observatory" />
