commit cc7360dc0c82cf12691225caf6a710299bd0994e parent f3bb679ebef13bc2807354654b8d304e56e7e159 Author: Dan Stillman <dstillman@zotero.org> Date: Tue, 9 Apr 2013 04:14:48 -0400 Fix for <div> appearing in some notes instead of <p> https://forums.zotero.org/discussion/28781/ Not totally sure how/when this was happening. To fix existing notes, switch the Format to Paragraph manually. Diffstat:
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/bindings/styled-textbox.xml b/chrome/content/zotero/bindings/styled-textbox.xml @@ -375,13 +375,17 @@ if (!SJOW.tinyMCE) { var exts = Zotero.getInstalledExtensions(function(exts) { for each(var ext in exts) { - if (ext.indexOf('NoScript') != -1) { - var warning = win.document.getElementById('noScriptWarning'); + if (ext.indexOf('NoScript') != -1 && ext.indexOf('disabled') == -1) { + var doc = win.document; + var div = doc.getElementById('tinymce'); + var warning = doc.createElement('div'); + warning.id = 'noScriptWarning'; var str = "The NoScript extension is preventing Zotero " + "from displaying notes. To use NoScript and Zotero together, " + "whitelist the 'file:' scheme in the NoScript preferences " + "and restart " + Zotero.appName + "."; warning.appendChild(document.createTextNode(str)); + div.appendChild(warning); break; } } diff --git a/chrome/content/zotero/tinymce/integration.html b/chrome/content/zotero/tinymce/integration.html @@ -51,6 +51,6 @@ html, body { </script> </head> <body> -<div id="tinymce"><div id="noScriptWarning"/></div> +<div id="tinymce"></div> </body> </html> diff --git a/chrome/content/zotero/tinymce/note.html b/chrome/content/zotero/tinymce/note.html @@ -91,6 +91,6 @@ table.mceLayout { </style> </head> <body> -<div id="tinymce"><div id="noScriptWarning"/></div> +<div id="tinymce"></div> </body> </html> diff --git a/chrome/content/zotero/tinymce/noteview.html b/chrome/content/zotero/tinymce/noteview.html @@ -68,6 +68,6 @@ table.mceLayout > tbody > tr.mceLast { </script> </head> <body> -<div id="tinymce"><div id="noScriptWarning"/></div> +<div id="tinymce"></div> </body> </html>