www

commit c2db7b53b19fbc2bdaa8a09f2d75b62ac6ee4b9d
parent 6566ba1682779ae4bdb350bac7b7d1c6a6ad7a3e
Author: Simon Kornblith <simon@simonster.com>
Date:   Tue,  2 Aug 2011 19:52:45 +0000

- Fix iframe by just specifying a massive height for it (no, height: 100% doesn't work)
- Cancel should work as expected


Diffstat:
M
chrome/content/zotero/integration/quickFormat.js
 | 
1
+
M
chrome/skin/default/zotero/integration.css
 | 
5
+++++

2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
@@ -629,6 +629,7 @@ var Zotero_QuickFormat = new function () {
 	this.onKeyPress = function(event) {
 		var keyCode = event.keyCode;
 		if(keyCode === event.DOM_VK_ESCAPE) {
+			io.citation.citationItems = [];
 			window.close();
 		}
 	}
diff --git a/chrome/skin/default/zotero/integration.css b/chrome/skin/default/zotero/integration.css
@@ -88,6 +88,7 @@
 
 #editor {
 	margin-top: 10px;
+	max-height: 100px;
 }
 
 .quick-format-title {
@@ -134,6 +135,10 @@
 	padding-bottom: 0;
 }
 
+#quick-format-iframe {
+	height: 9999px;
+}
+
 body {
 	margin: 0 2px 0 2px;
 	padding: 0;