www

commit 7b8db1f09fc4f14f0a5b20743cf879e6b5bf45bb
parent d245064f87ee61c9353adf7ad761f5aa02c133f9
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 13 Nov 2009 06:43:59 +0000

Remove (unused, I believe) eval() calls in TinyMCE to avoid AMO flagging, though we'd have to do so on every update


Diffstat:
M
chrome/content/zotero/tinymce/tiny_mce.js
 | 
20
++++----------------
M
chrome/content/zotero/tinymce/tiny_mce_popup.js
 | 
2
+-

2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/chrome/content/zotero/tinymce/tiny_mce.js b/chrome/content/zotero/tinymce/tiny_mce.js
@@ -836,7 +836,7 @@ tinymce.create('static tinymce.util.JSON', {
 
 	parse : function(s) {
 		try {
-			return eval('(' + s + ')');
+			throw ('evalremoved2');
 		} catch (ex) {
 			// Ignore
 		}
@@ -6568,7 +6568,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 						error : t.settings.error,
 						async : false,
 						success : function(co) {
-							t.eval(co);
+							throw('evalremoved3');
 						}
 					});
 				} else
@@ -6617,9 +6617,9 @@ window.tinymce.dom.Sizzle = Sizzle;
 			// Evaluate script
 			if (!w.execScript) {
 				try {
-					eval.call(w, co);
+					throw('evalremoved1');
 				} catch (ex) {
-					eval(co, w); // Firefox 3.0a8
+					throw('evalremoved2');
 				}
 			} else
 				w.execScript(co); // IE
@@ -6668,18 +6668,6 @@ window.tinymce.dom.Sizzle = Sizzle;
 					done(o);
 					allDone();
 				});
-
-				/*
-				tinymce.util.XHR.send({
-					url : o.url,
-					error : t.settings.error,
-					success : function(co) {
-						t.eval(co);
-						done(o);
-						allDone();
-					}
-				});
-				*/
 			};
 
 			each(sc, function(o) {
diff --git a/chrome/content/zotero/tinymce/tiny_mce_popup.js b/chrome/content/zotero/tinymce/tiny_mce_popup.js
@@ -86,7 +86,7 @@ tinyMCEPopup = {
 
 	executeOnLoad : function(s) {
 		this.onInit.add(function() {
-			eval(s);
+			throw('evalremoved1');
 		});
 	},