Skip to content

Commit

Permalink
Use entity_encoding: 'raw' in notes
Browse files Browse the repository at this point in the history
This (and some other things) will help avoid changes in uploaded notes, which
cause loss of cursor position and other problems after local notes are updated
with the server version.

A side effect is that multiple spaces won't be converted to ` `, so
anything consuming note content will have to use `white-space: pre`.

(Notes in reports appear to be substituting ` ` as necessary,
though I'm not sure where that's happening.)
  • Loading branch information
dstillman committed Feb 2, 2017
1 parent ef0d9af commit bd8debb
Showing 1 changed file with 3 additions and 24 deletions.
27 changes: 3 additions & 24 deletions resource/tinymce/note.html
Expand Up @@ -9,10 +9,10 @@
tinymce.init({
body_id: "zotero-tinymce-note",
content_css: "css/note-content.css",
entities: "160,nbsp",


browser_spellcheck: true,
convert_urls: false,
entity_encoding: 'raw',
fix_list_elements: true,

plugins: "autolink,code,contextmenu,directionality,link,lists,paste,searchreplace",
Expand Down Expand Up @@ -66,28 +66,7 @@
});
});
});
},

// More restrictive version of default set, with JS/etc. removed
valid_elements: "@[id|class|style|title|dir<ltr?rtl|lang|xml::lang],"
+ "a[rel|rev|charset|hreflang|tabindex|accesskey|type|"
+ "name|href|target|title|class],strong/b,em/i,strike,u,"
+ "#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|"
+ "src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,"
+ "-blockquote[cite],-table[border=0|cellspacing|cellpadding|width|frame|rules|"
+ "height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|"
+ "height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,"
+ "#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor"
+ "|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],"
+ "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,"
+ "kbd,label[for],legend,optgroup[label|disabled],option[disabled|label|selected|value],"
+ "q[cite],samp,select[disabled|multiple|name|size],small,"
+ "textarea[cols|rows|disabled|name|readonly],tt,var,big"
}
});
tinymce.execCommand("mceAddEditor", true, "tinymce");
</script>
Expand Down

0 comments on commit bd8debb

Please sign in to comment.