diff --git a/chrome/content/zotero/bibliography.js b/chrome/content/zotero/bibliography.js index c3846a14d2..3e1bd00e28 100644 --- a/chrome/content/zotero/bibliography.js +++ b/chrome/content/zotero/bibliography.js @@ -30,6 +30,7 @@ ////////////////////////////////////////////////////////////////////////////// // Class to provide options for bibliography +// Used by rtfScan.xul, integrationDocPrefs.xul, and bibliography.xul var Zotero_File_Interface_Bibliography = new function() { var _io, _saveStyle; @@ -45,7 +46,10 @@ var Zotero_File_Interface_Bibliography = new function() { function init() { // Set font size from pref // Affects bibliography.xul and integrationDocPrefs.xul - Zotero.setFontSize(document.documentElement); + var bibContainer = document.getElementById("zotero-bibliography-container"); + if(bibContainer) { + Zotero.setFontSize(document.getElementById("zotero-bibliography-container")); + } if(window.arguments && window.arguments.length) { _io = window.arguments[0]; diff --git a/chrome/content/zotero/integration/addCitationDialog.xul b/chrome/content/zotero/integration/addCitationDialog.xul index cdf1bb3c4f..6c60557505 100644 --- a/chrome/content/zotero/integration/addCitationDialog.xul +++ b/chrome/content/zotero/integration/addCitationDialog.xul @@ -41,6 +41,7 @@ onunload="doUnload();" ondialogaccept="return Zotero_Citation_Dialog.accept();" ondialogcancel="Zotero_Citation_Dialog.cancel();" + onclose="Zotero_Citation_Dialog.cancel(); event.preventDefault(); event.stopPropagation();" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" persist="screenX screenY width height" resizable="true" diff --git a/chrome/content/zotero/integration/editBibliographyDialog.xul b/chrome/content/zotero/integration/editBibliographyDialog.xul index eb7e673286..f1123cbc49 100644 --- a/chrome/content/zotero/integration/editBibliographyDialog.xul +++ b/chrome/content/zotero/integration/editBibliographyDialog.xul @@ -38,7 +38,7 @@ onload="Zotero_Bibliography_Dialog.load();" ondialogaccept="Zotero_Bibliography_Dialog.accept();" ondialogcancel="Zotero_Bibliography_Dialog.close();" - onclose="Zotero_Bibliography_Dialog.close();" + onclose="Zotero_Bibliography_Dialog.close(); event.preventDefault(); event.stopPropagation();" onunload="doUnload();" buttons="extra1,extra2,accept,cancel" buttonpack="end" xmlns:html="http://www.w3.org/1999/xhtml" diff --git a/chrome/content/zotero/integration/integrationDocPrefs.xul b/chrome/content/zotero/integration/integrationDocPrefs.xul index f80ee1a138..a3f9f60dae 100644 --- a/chrome/content/zotero/integration/integrationDocPrefs.xul +++ b/chrome/content/zotero/integration/integrationDocPrefs.xul @@ -35,39 +35,41 @@ title="&zotero.integration.docPrefs.title;" onload="Zotero_File_Interface_Bibliography.init();" ondialogaccept="Zotero_File_Interface_Bibliography.acceptSelection();" + onclose="document.documentElement.cancelDialog(); event.preventDefault(); event.stopPropagation();" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" persist="screenX screenY" style="width: 600px">