From 7e7ec071705ef29dc4f2ff636f2dde1aee0eb1f1 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 2 Aug 2019 06:14:50 -0400
Subject: [PATCH] Remove "Show developer tools" checkbox and show menu by
 default

Everybody's a developer now
---
 .../content/zotero/preferences/preferences_advanced.js   | 8 --------
 .../content/zotero/preferences/preferences_advanced.xul  | 9 ---------
 chrome/content/zotero/standalone/standalone.js           | 4 ----
 chrome/content/zotero/standalone/standalone.xul          | 3 +--
 chrome/locale/en-US/zotero/standalone.dtd                | 1 +
 5 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_advanced.js b/chrome/content/zotero/preferences/preferences_advanced.js
index e66fce21c2..4e7d507bcc 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.js
+++ b/chrome/content/zotero/preferences/preferences_advanced.js
@@ -64,14 +64,6 @@ Zotero_Preferences.Advanced = {
 	}),
 	
 	
-	onDeveloperToolsToggle: function () {
-		setTimeout(function () {
-			var enabled = Zotero.Prefs.get('devtools.chrome.enabled', true);
-			window.opener.document.getElementById('developer-menu').hidden = !enabled;
-		});
-	},
-	
-	
 	migrateDataDirectory: Zotero.Promise.coroutine(function* () {
 		var currentDir = Zotero.DataDirectory.dir;
 		var defaultDir = Zotero.DataDirectory.defaultDir;
diff --git a/chrome/content/zotero/preferences/preferences_advanced.xul b/chrome/content/zotero/preferences/preferences_advanced.xul
index 3c0070a32d..05ff72d9d8 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.xul
+++ b/chrome/content/zotero/preferences/preferences_advanced.xul
@@ -39,7 +39,6 @@
 		<preferences>
 			<preference id="pref-automaticScraperUpdates" name="extensions.zotero.automaticScraperUpdates" type="bool"/>
 			<preference id="pref-reportTranslationFailure" name="extensions.zotero.reportTranslationFailure" type="bool"/>
-			<preference id="pref-developerTools" name="devtools.chrome.enabled" type="bool"/>
 			
 			<preference id="pref-baseAttachmentPath" name="extensions.zotero.baseAttachmentPath" type="string"/>
 			<preference id="pref-useDataDir" name="extensions.zotero.useDataDir" type="bool"/>
@@ -136,14 +135,6 @@
 					<groupbox id="zotero-prefpane-advanced-advancedConfiguration">
 						<caption label="&zotero.preferences.advanced.advancedConfiguration;"/>
 						
-						<vbox>
-							<checkbox
-								label="Show developer tools"
-								preference="pref-developerTools"
-								oncommand="Zotero_Preferences.Advanced.onDeveloperToolsToggle()"
-								tooltiptext="Adds a Developer menu to the Tools menu"/>
-						</vbox>
-						
 						<hbox id="zotero-prefpane-advanced-openbuttons" align="center" style="display: block">
 							<button id="config-editor"
 								label="&zotero.preferences.configEditor;"
diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js
index 2de09c742c..d3837c90f4 100644
--- a/chrome/content/zotero/standalone/standalone.js
+++ b/chrome/content/zotero/standalone/standalone.js
@@ -48,10 +48,6 @@ const ZoteroStandalone = new function() {
 			return Zotero.initializationPromise;
 		})
 		.then(async function () {
-			if (Zotero.Prefs.get('devtools.chrome.enabled', true)) {
-				document.getElementById('developer-menu').hidden = false;
-			}
-			
 			document.getElementById('key_copyCitation')
 				.setAttribute('key', Zotero.Keys.getKeyForCommand('copySelectedItemCitationsToClipboard'));
 			document.getElementById('key_copyBibliography')
diff --git a/chrome/content/zotero/standalone/standalone.xul b/chrome/content/zotero/standalone/standalone.xul
index c61b416860..b501d6916e 100644
--- a/chrome/content/zotero/standalone/standalone.xul
+++ b/chrome/content/zotero/standalone/standalone.xul
@@ -198,8 +198,7 @@
 							<menuitem id="menu_addons" label="&addons.label;"
 									oncommand="Zotero.openInViewer('chrome://mozapps/content/extensions/extensions.xul', ZoteroStandalone.updateAddonsPane)"/>
 							<menu id="developer-menu"
-									label="Developer"
-									hidden="true">
+									label="&developer.label;">
 								<menupopup>
 									<menuitem id="menu_errorConsole" label="Error Console" oncommand="toJavaScriptConsole()"/>
 									<menuitem id="menu_runJS" label="Run JavaScript" oncommand="openRunJSWindow()"/>
diff --git a/chrome/locale/en-US/zotero/standalone.dtd b/chrome/locale/en-US/zotero/standalone.dtd
index 0d72e18b8b..e389966d89 100644
--- a/chrome/locale/en-US/zotero/standalone.dtd
+++ b/chrome/locale/en-US/zotero/standalone.dtd
@@ -48,6 +48,7 @@
 <!ENTITY installConnector.label "Install Browser Connector">
 <!ENTITY installConnector.accesskey "C">
 <!ENTITY addons.label				"Add-ons">
+<!ENTITY developer.label           "Developer">
 
 <!--WINDOW MENU-->
 <!ENTITY minimizeWindow.key       "m">