diff --git a/chrome/content/zotero/bibliography.js b/chrome/content/zotero/bibliography.js index 4eedf0bbc3..e20f165419 100644 --- a/chrome/content/zotero/bibliography.js +++ b/chrome/content/zotero/bibliography.js @@ -93,9 +93,8 @@ var Zotero_File_Interface_Bibliography = new function() { document.getElementById('output-radio').selectedItem = document.getElementById(Zotero.Prefs.get("export.bibliographySettings")); - // disable clipboard on the Mac, because it can't support formatted - // output - if(Zotero.isMac) { + // disable clipboard in Fx3.0 on the Mac, because it can't support formatted output + if(Zotero.isMac && Zotero.isFx30) { document.getElementById("mac-clipboard-warning").hidden = false; } } diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js index 3ed9d95ca4..81e54c16ab 100644 --- a/chrome/content/zotero/preferences/preferences.js +++ b/chrome/content/zotero/preferences/preferences.js @@ -632,10 +632,6 @@ function deleteSelectedQuickCopySite() { function updateQuickCopyInstructions() { - if (Zotero.isMac) { - document.getElementById('quickCopy-macWarning').setAttribute('hidden', false); - } - var prefix = Zotero.isMac ? 'Cmd+Shift+' : 'Ctrl+Alt+'; var key = Zotero.Prefs.get('keys.copySelectedItemsToClipboard'); diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul index e17cbf34a1..19b5de823e 100644 --- a/chrome/content/zotero/preferences/preferences.xul +++ b/chrome/content/zotero/preferences/preferences.xul @@ -551,8 +551,6 @@ To add a new preference: - -