From b9793ac7656ee709db486ff97b9bbabacfbfff3e Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 21 Aug 2007 08:50:44 +0000
Subject: [PATCH] Add pref browserContentContextMenu to disable Zotero context
 menu items in the browser content area -- will make non-hidden after the
 string freeze

---
 chrome/content/zotero/overlay.js  |  4 ++++
 chrome/content/zotero/overlay.xul | 10 +++++-----
 defaults/preferences/zotero.js    |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 1e712dfd6..4a854bc90 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -1616,6 +1616,10 @@ var ZoteroPane = new function()
 	// Updates browser context menu options
 	function contextPopupShowing()
 	{
+		if (!Zotero.Prefs.get('browserContentContextMenu')) {
+			return;
+		}
+		
 		var menuitem = document.getElementById("zotero-context-add-to-current-note");
 		var showing = false;
 		if (menuitem){
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 322440140..8b9ae3ec8 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -51,18 +51,18 @@
 	</toolbarpalette>
 	
 	<popup id="contentAreaContextMenu">
-		<menuseparator id="zotero-context-separator"/>
+		<menuseparator id="zotero-context-separator" hidden="true"/>
 		<menuitem id="zotero-context-add-to-current-note" class="menu-iconic"
-			label="&zotero.contextMenu.addTextToCurrentNote;"
+			label="&zotero.contextMenu.addTextToCurrentNote;" hidden="true"
 			oncommand="ZoteroPane.addTextToNote(window.content.getSelection().toString())"/>
 		<menuitem id="zotero-context-add-to-new-note" class="menu-iconic"
-			label="&zotero.contextMenu.addTextToNewNote;"
+			label="&zotero.contextMenu.addTextToNewNote;" hidden="true"
 			oncommand="var itemID = ZoteroPane.addItemFromPage(); ZoteroPane.newNote(false, itemID, window.content.getSelection().toString())"/>
 		<menuitem id="zotero-context-save-link-as-snapshot" class="menu-iconic"
-			label="&zotero.contextMenu.saveLinkAsSnapshot;"
+			label="&zotero.contextMenu.saveLinkAsSnapshot;" hidden="true"
 			oncommand="Zotero.Attachments.importFromURL(window.gContextMenu.linkURL, false, false, false, ZoteroPane.getSelectedCollection(true))"/>
 		<menuitem id="zotero-context-save-image-as-snapshot" class="menu-iconic"
-			label="&zotero.contextMenu.saveImageAsSnapshot;"
+			label="&zotero.contextMenu.saveImageAsSnapshot;" hidden="true"
 			oncommand="Zotero.Attachments.importFromURL(window.gContextMenu.onImage ? window.gContextMenu.imageURL : window.gContextMenu.bgImageURL, false, false, false, ZoteroPane.getSelectedCollection(true))"/>
 	</popup>
 	
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index 5782f5e36..fe124ebe4 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -9,6 +9,7 @@ pref("extensions.zotero.automaticScraperUpdates",true);
 pref("extensions.zotero.cacheTranslatorData",true);
 pref("extensions.zotero.zoteroPaneOnTop",false);
 pref("extensions.zotero.statusBarIcon", 2);
+pref("extensions.zotero.browserContentContextMenu", true);
 pref("extensions.zotero.openURL.resolver","http://athene.gmu.edu:8888/lfp/LinkFinderPlus/Display");
 pref("extensions.zotero.openURL.version","0.1");
 pref("extensions.zotero.parseEndNoteMIMETypes",true);