www

commit 70bf48a616ffdc9296f0a1e60a6e528e06367163
parent 6f9daa446998be33fe6b0b2cd7cfa038df45015c
Author: Simon Kornblith <simon@simonster.com>
Date:   Wed, 31 Aug 2011 22:31:00 +0000

- Refuse to close QuickFormat editor if text remains in the box
- Support :<PAGE NUMBER> syntax


Diffstat:
M
chrome/content/zotero/integration/quickFormat.js
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
@@ -154,7 +154,7 @@ var Zotero_QuickFormat = new function () {
 		var str = _getEditorContent();
 		var haveConditions = false;
 		
-		const specifiedLocatorRe = /,? *(pp|p)(?:\. *| +)([0-9\-]+) *$/;
+		const specifiedLocatorRe = /(?:,? *(pp|p)(?:\. *| +)|:)([0-9\-]+) *$/;
 		const yearPageLocatorRe = /,? *([0-9]+) *((B[. ]*C[. ]*|B[. ]*)|[AC][. ]*|A[. ]*D[. ]*|C[. ]*E[. ]*)?,? *(?:([0-9\-]+))?$/i;
 		const creatorSplitRe = /(?:,| *(?:and|\&)) +/;
 		const charRe = /[\w\u007F-\uFFFF]/;
@@ -674,7 +674,7 @@ var Zotero_QuickFormat = new function () {
 		var keyCode = event.keyCode;
 		if(keyCode === event.DOM_VK_RETURN || keyCode === event.DOM_VK_ENTER) {
 			event.preventDefault();
-			if(!_bubbleizeSelected()) {
+			if(!_bubbleizeSelected() && !_getEditorContent()) {
 				_accept();
 			}
 		} else if(keyCode === event.DOM_VK_TAB || event.charCode === 59 /* ; */) {