Uniquely prefix DOM ids.

Fixes #1401
greasemonkey · Aug 19, 2011 · 02126f1 · 02126f1
1 parent 081371a
commit 02126f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/content/browser.js b/content/browser.js
@@ -246,8 +246,8 @@ GM_BrowserUI.chromeUnload = function() {
  * to show our context items.
  */
 GM_BrowserUI.contextMenuShowing = function() {
-  var contextItem = document.getElementById("view-userscript");
-  var contextSep = document.getElementById("install-userscript-sep");
+  var contextItem = document.getElementById("greasemonkey-view-userscript");
+  var contextSep = document.getElementById("greasemonkey-install-sep");
 
   var culprit = document.popupNode;
 

diff --git a/content/browser.xul b/content/browser.xul
@@ -22,10 +22,6 @@
     <command id="gm_toggle_checked" oncommand="GM_setEnabled(!GM_getEnabled());"/>
   </commandset>
 
-  <window id="main-window">
-    <keyset id="userscript-command-keys" insertafter="mainKeyset"></keyset>
-  </window>
-
   <toolbarpalette id='BrowserToolbarPalette'>
     <toolbarbutton id='greasemonkey-tbb' type='menu-button'
       class='toolbarbutton-1 chromeclass-toolbar-additional'
@@ -37,12 +33,12 @@
   </toolbarpalette>
 
   <popup id="contentAreaContextMenu">
-    <menuitem id="view-userscript"
+    <menuitem id="greasemonkey-view-userscript"
       accesskey="&menu.show.accesskey;"
       label="&menu.show;"
       insertbefore="context-openlink"
       oncommand="GM_BrowserUI.viewContextItemClicked(event);" />
-    <menuseparator id="install-userscript-sep"
+    <menuseparator id="greasemonkey-install-sep"
       insertbefore="context-openlink" />
   </popup>