commit 3510e1dda8929a988078e5a2b0c9391452ea59aa
parent 0a25cdad96ca696537d07699025181a69487ccd9
Author: Simon Kornblith <simon@simonster.com>
Date: Sun, 12 Feb 2012 18:56:04 -0500
Fix Linux integration issue reported by fbennett at http://groups.google.com/group/zotero-dev/browse_thread/thread/e6618d5f27d1cd7e (ultimate cause appears to be some kind of Linux-specific bug relating to dialogs)
Diffstat:
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git 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
@@ -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
@@ -35,6 +35,7 @@
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">