Cherry pick Legacy Toolbar Button support #1321 (part 3)

gorhill · May 30, 2015 · e9633d4 · e9633d4
1 parent 3558149
commit e9633d4
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
@@ -2087,11 +2087,18 @@ vAPI.contextMenu.register = function(doc) {
         return;
     }
 
+    if (doc.getElementById(this.menuItemId)) {
+        // Context menu already registered for this window
+        return;
+    }
+
     var contextMenu = doc.getElementById('contentAreaContextMenu');
-    var menuitem = this.createContextMenuItem(doc);
-    menuitem.addEventListener('command', this.onCommand);
-    contextMenu.addEventListener('popupshowing', this.displayMenuItem);
-    contextMenu.insertBefore(menuitem, doc.getElementById('inspect-separator'));
+    if (contextMenu) {
+        var menuitem = this.createContextMenuItem(doc);
+        menuitem.addEventListener('command', this.onCommand);
+        contextMenu.addEventListener('popupshowing', this.displayMenuItem);
+        contextMenu.insertBefore(menuitem, doc.getElementById('inspect-separator'));
+    }
 };
 
 /******************************************************************************/