www

commit 593d90c29d2ee962c096f65d8c9378111464f99c
parent 4e677668aab102e6ec2864dff62833645b9808c2
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue,  9 Nov 2010 21:06:57 +0000

Re-enable object element (without wildcard attributes) in notes on trunk and 2.1b2 tag


Diffstat:
M
chrome/content/zotero/tinymce/note.html
 | 
2
+-
M
chrome/content/zotero/tinymce/noteview.html
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/tinymce/note.html b/chrome/content/zotero/tinymce/note.html
@@ -58,7 +58,7 @@
 			+ "|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,"
 			+ "-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face"
 			+ "|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],"
-			+ "param[name|value|_value],"
+			+ "object[classid|width|height|codebase|type],param[name|value|_value],"
 			+ "map[name],area[shape|coords|href|alt|target],bdo,"
 			+ "button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|"
 			+ "valign|width],dfn,fieldset,"
diff --git a/chrome/content/zotero/tinymce/noteview.html b/chrome/content/zotero/tinymce/noteview.html
@@ -45,7 +45,7 @@ table.mceLayout > tbody > tr.mceLast {
 			+ "|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,"
 			+ "-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face"
 			+ "|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],"
-			+ "param[name|value|_value],"
+			+ "object[classid|width|height|codebase|type],param[name|value|_value],"
 			+ "map[name],area[shape|coords|href|alt|target],bdo,"
 			+ "button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|"
 			+ "valign|width],dfn,fieldset,"