From 28535ac64da67dc1c54c7f8e9f60ff77ddcec886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Wed, 11 Jul 2018 19:35:14 +0300 Subject: [PATCH] Throw proper error in Prefs.get(). Use double-quotes in default prefs --- chrome/content/zotero/xpcom/prefs.js | 2 +- defaults/preferences/zotero.js | 56 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/chrome/content/zotero/xpcom/prefs.js b/chrome/content/zotero/xpcom/prefs.js index 431e6feb62..49df260b9e 100644 --- a/chrome/content/zotero/xpcom/prefs.js +++ b/chrome/content/zotero/xpcom/prefs.js @@ -104,7 +104,7 @@ Zotero.Prefs = new function(){ } } catch (e){ - throw ("Invalid preference '" + pref + "'"); + throw new Error("Invalid preference '" + pref + "'"); } } diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js index 232b557cbf..0b00411576 100644 --- a/defaults/preferences/zotero.js +++ b/defaults/preferences/zotero.js @@ -7,9 +7,9 @@ pref("extensions.zotero.firstRun2", true); pref("extensions.zotero@chnm.gmu.edu.description", "chrome://zotero/locale/zotero.properties"); pref("extensions.zotero.saveRelativeAttachmentPath", false); -pref("extensions.zotero.baseAttachmentPath", ''); +pref("extensions.zotero.baseAttachmentPath", ""); pref("extensions.zotero.useDataDir", false); -pref("extensions.zotero.dataDir", ''); +pref("extensions.zotero.dataDir", ""); pref("extensions.zotero.warnOnUnsafeDataDir", true); pref("extensions.zotero.debug.log",false); pref("extensions.zotero.debug.log.slowTime", 250); @@ -23,7 +23,7 @@ pref("extensions.zotero.automaticScraperUpdates",true); pref("extensions.zotero.zoteroDotOrgVersionHeader", true); pref("extensions.zotero.triggerProxyAuthentication", true); // Proxy auth URLs should respond successfully to HEAD requests over HTTP and HTTPS (in case of forced HTTPS requests) -pref("extensions.zotero.proxyAuthenticationURLs", 'https://www.acm.org,https://www.ebscohost.com,https://www.sciencedirect.com,https://ieeexplore.ieee.org,https://www.jstor.org,http://www.ovid.com,https://link.springer.com,https://www.tandfonline.com'); +pref("extensions.zotero.proxyAuthenticationURLs", "https://www.acm.org,https://www.ebscohost.com,https://www.sciencedirect.com,https://ieeexplore.ieee.org,https://www.jstor.org,http://www.ovid.com,https://link.springer.com,https://www.tandfonline.com"); pref("extensions.zotero.browserContentContextMenu", true); pref("extensions.zotero.openURL.resolver","http://worldcatlibraries.org/registry/gateway"); pref("extensions.zotero.openURL.version","1.0"); @@ -38,7 +38,7 @@ pref("extensions.zotero.recursiveCollections", false); pref("extensions.zotero.autoRecognizeFiles", true); pref("extensions.zotero.autoRenameFiles", true); pref("extensions.zotero.autoRenameFiles.fileTypes", "application/pdf"); -pref("extensions.zotero.attachmentRenameFormatString", '{%c - }{%y - }{%t{50}}'); +pref("extensions.zotero.attachmentRenameFormatString", "{%c - }{%y - }{%t{50}}"); pref("extensions.zotero.capitalizeTitles", false); pref("extensions.zotero.launchNonNativeFiles", false); pref("extensions.zotero.sortNotesChronologically", false); @@ -68,26 +68,26 @@ pref("extensions.zotero.lastRenameAssociatedFile", false); pref("extensions.zotero.lastLongTagMode", 0); pref("extensions.zotero.lastLongTagDelimiter", ";"); -pref("extensions.zotero.fallbackSort", 'firstCreator,date,title,dateAdded'); +pref("extensions.zotero.fallbackSort", "firstCreator,date,title,dateAdded"); pref("extensions.zotero.sortCreatorAsString", false); //Tag Cloud pref("extensions.zotero.tagCloud", false); // Keyboard shortcuts -pref("extensions.zotero.keys.openZotero", 'Z'); -pref("extensions.zotero.keys.toggleFullscreen", 'F'); -pref("extensions.zotero.keys.saveToZotero", 'S'); -pref("extensions.zotero.keys.newItem", 'N'); -pref("extensions.zotero.keys.newNote", 'O'); -pref("extensions.zotero.keys.library", 'L'); -pref("extensions.zotero.keys.quicksearch", 'K'); -pref("extensions.zotero.keys.copySelectedItemCitationsToClipboard", 'A'); -pref("extensions.zotero.keys.copySelectedItemsToClipboard", 'C'); -pref("extensions.zotero.keys.toggleTagSelector", 'T'); -pref("extensions.zotero.keys.sync", 'Y'); -pref("extensions.zotero.keys.toggleAllRead", 'R'); -pref("extensions.zotero.keys.toggleRead", '`'); +pref("extensions.zotero.keys.openZotero", "Z"); +pref("extensions.zotero.keys.toggleFullscreen", "F"); +pref("extensions.zotero.keys.saveToZotero", "S"); +pref("extensions.zotero.keys.newItem", "N"); +pref("extensions.zotero.keys.newNote", "O"); +pref("extensions.zotero.keys.library", "L"); +pref("extensions.zotero.keys.quicksearch", "K"); +pref("extensions.zotero.keys.copySelectedItemCitationsToClipboard", "A"); +pref("extensions.zotero.keys.copySelectedItemsToClipboard", "C"); +pref("extensions.zotero.keys.toggleTagSelector", "T"); +pref("extensions.zotero.keys.sync", "Y"); +pref("extensions.zotero.keys.toggleAllRead", "R"); +pref("extensions.zotero.keys.toggleRead", "`"); pref("extensions.zotero.search.quicksearch-mode", "fields"); @@ -106,10 +106,10 @@ pref("extensions.zotero.report.includeAllChildItems", true); pref("extensions.zotero.report.combineChildItems", true); // Export and citation settings -pref("extensions.zotero.export.lastTranslator", '14763d24-8ba0-45df-8f52-b8d1108e7ac9'); -pref("extensions.zotero.export.translatorSettings", 'true,false'); -pref("extensions.zotero.export.lastStyle", 'http://www.zotero.org/styles/chicago-note-bibliography'); -pref("extensions.zotero.export.bibliographySettings", 'save-as-rtf'); +pref("extensions.zotero.export.lastTranslator", "14763d24-8ba0-45df-8f52-b8d1108e7ac9"); +pref("extensions.zotero.export.translatorSettings", "true,false"); +pref("extensions.zotero.export.lastStyle", "http://www.zotero.org/styles/chicago-note-bibliography"); +pref("extensions.zotero.export.bibliographySettings", "save-as-rtf"); pref("extensions.zotero.export.displayCharsetOption", true); pref("extensions.zotero.export.citePaperJournalArticleURL", false); pref("extensions.zotero.cite.automaticJournalAbbreviations", true); @@ -118,7 +118,7 @@ pref("extensions.zotero.import.createNewCollection.fromFileOpenHandler", true); pref("extensions.zotero.rtfScan.lastInputFile", ""); pref("extensions.zotero.rtfScan.lastOutputFile", ""); -pref("extensions.zotero.export.quickCopy.setting", 'bibliography=http://www.zotero.org/styles/chicago-note-bibliography'); +pref("extensions.zotero.export.quickCopy.setting", "bibliography=http://www.zotero.org/styles/chicago-note-bibliography"); pref("extensions.zotero.export.quickCopy.dragLimit", 50); pref("extensions.zotero.export.quickCopy.quoteBlockquotes.plainText", true); pref("extensions.zotero.export.quickCopy.quoteBlockquotes.richText", true); @@ -146,14 +146,14 @@ pref("extensions.zotero.streaming.enabled", true); // Sync pref("extensions.zotero.sync.autoSync", true); -pref("extensions.zotero.sync.server.username", ''); +pref("extensions.zotero.sync.server.username", ""); pref("extensions.zotero.sync.server.compressData", true); pref("extensions.zotero.sync.storage.enabled", true); pref("extensions.zotero.sync.storage.protocol", "zotero"); pref("extensions.zotero.sync.storage.verified", false); -pref("extensions.zotero.sync.storage.scheme", 'https'); -pref("extensions.zotero.sync.storage.url", ''); -pref("extensions.zotero.sync.storage.username", ''); +pref("extensions.zotero.sync.storage.scheme", "https"); +pref("extensions.zotero.sync.storage.url", ""); +pref("extensions.zotero.sync.storage.username", ""); pref("extensions.zotero.sync.storage.maxDownloads", 4); pref("extensions.zotero.sync.storage.maxUploads", 2); pref("extensions.zotero.sync.storage.deleteDelayDays", 30); @@ -176,7 +176,7 @@ pref("extensions.zotero.purge.items", false); pref("extensions.zotero.purge.tags", false); // Zotero pane persistent data -pref("extensions.zotero.pane.persist", ''); +pref("extensions.zotero.pane.persist", ""); // Domains allowed to import, separated by a semicolon pref("extensions.zotero.ingester.allowedSites", "");