www

commit aa0a3544bde6a056dc4fb8214d3eb812d2544aff
parent e8069258448a0fa072cd3429ac494b1e49025b57
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 30 Oct 2012 04:46:19 -0400

Fix XPI note loading in Fx17 due to navigator.userAgent error

Diffstat:
M
chrome/content/zotero/tinymce/plugins/paste/editor_plugin.js
 | 
4
+++-
M
chrome/content/zotero/tinymce/tiny_mce.js
 | 
4
+++-

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/tinymce/plugins/paste/editor_plugin.js b/chrome/content/zotero/tinymce/plugins/paste/editor_plugin.js
@@ -255,7 +255,9 @@
 			// Check if we should use the new auto process method			
 			if (getParam(ed, "paste_auto_cleanup_on_paste")) {
 				// Is it's Opera or older FF use key handler
-				if (tinymce.isOpera || /Firefox\/2/.test(navigator.userAgent)) {
+				// Modified by Dan S./Zotero
+				//if (tinymce.isOpera || /Firefox\/2/.test(navigator.userAgent)) {
+				if (false) {
 					ed.onKeyDown.add(function(ed, e) {
 						if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45))
 							grabContent(e);
diff --git a/chrome/content/zotero/tinymce/tiny_mce.js b/chrome/content/zotero/tinymce/tiny_mce.js
@@ -12,7 +12,9 @@
 		releaseDate : '2010-09-29',
 
 		_init : function() {
-			var t = this, d = document, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;
+			// Modified by Dan S./Zotero
+			//var t = this, d = document, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;
+			var t = this, d = document, na = navigator, ua = "Gecko " + na.platform, i, nl, n, base, p, v;
 
 			t.isOpera = win.opera && opera.buildNumber;