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

This commit is contained in:
Dan Stillman 2012-10-30 04:46:19 -04:00
parent e806925844
commit aa0a3544bd
2 changed files with 6 additions and 2 deletions

View File

@ -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);

4
chrome/content/zotero/tinymce/tiny_mce.js vendored Executable file → Normal file
View File

@ -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;