From 593d90c29d2ee962c096f65d8c9378111464f99c Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 9 Nov 2010 21:06:57 +0000 Subject: [PATCH] Re-enable object element (without wildcard attributes) in notes on trunk and 2.1b2 tag --- chrome/content/zotero/tinymce/note.html | 2 +- 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 index 99e0bad4fc..f79da9d7a7 100755 --- 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 index 40793220bf..2565ef4e60 100644 --- 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,"