yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes: U4-6344 TinyMCE RTE style_formats configuration changes

Browse Source
This commit is contained in:
Shannon
2015-03-09 17:31:29 +11:00
parent b3f6f48834
commit 2834ccdc2b
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/source.html
View File

@@ -31,7 +31,7 @@ function inArray(key, arr)
tinymce = parent.tinymce;
editor = tinymce.activeEditor;
var i, userSettings = editor.settings.codemirror ? JSON.parse(editor.settings.codemirror) : {};
var i, userSettings = editor.settings.codemirror ? (typeof editor.settings.codemirror === 'object') ? editor.settings.codemirror : JSON.parse(editor.settings.codemirror) : {};
CMsettings = {
path: userSettings.path || 'CodeMirror',
indentOnInit: userSettings.indentOnInit || false,