diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/code/plugin.min.js b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/code/plugin.min.js
index 9e7e89895e..cfcef52bab 100755
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/code/plugin.min.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/code/plugin.min.js
@@ -1 +1,7 @@
-tinymce.PluginManager.add("code",function(e){function o(){e.windowManager.open({title:"Source code",body:{type:"textbox",name:"code",multiline:!0,minWidth:e.getParam("code_dialog_width",600),minHeight:e.getParam("code_dialog_height",Math.min(tinymce.DOM.getViewPort().h-200,500)),value:e.getContent({source_view:!0}),spellcheck:!1,style:"direction: ltr; text-align: left"},onSubmit:function(o){e.focus(),e.undoManager.transact(function(){e.setContent(o.data.code)}),e.selection.setCursorLocation(),e.nodeChanged()}})}e.addCommand("mceCodeEditor",o),e.addButton("code",{icon:"code",tooltip:"Source code",onclick:o}),e.addMenuItem("code",{icon:"code",text:"Source code",context:"tools",onclick:o})});
\ No newline at end of file
+tinymce.PluginManager.add("code", function(e) {
+ function o() {
+ e.windowManager.open({ title: "Source code", body: { type: "textbox", name: "code", multiline: !0, minWidth: e.getParam("code_dialog_width", 600), minHeight: e.getParam("code_dialog_height", Math.min(tinymce.DOM.getViewPort().h - 200, 500)), value: e.getContent({ source_view: !0 }), spellcheck: !1, style: "direction: ltr; text-align: left" }, onSubmit: function(o) { e.focus(), e.undoManager.transact(function() { e.setContent(o.data.code) }), e.selection.setCursorLocation(), e.nodeChanged() } })
+ }
+
+ e.addCommand("mceCodeEditor", o), e.addButton("code", { icon: "code", tooltip: "Source code", onclick: o }), e.addMenuItem("code", { icon: "code", text: "Source code", context: "tools", onclick: o })
+});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/plugin.min.js b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/plugin.min.js
index 425083626d..43938f52c9 100755
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/plugin.min.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/plugin.min.js
@@ -1,3 +1,24 @@
tinymce.PluginManager.requireLangPack("codemirror");
-tinymce.PluginManager.add("codemirror",function(a,c){function b(){a.focus();a.selection.collapse(!0);a.selection.setContent('�');var b=a.windowManager.open({title:"Source code",url:c+"/source.html",width: a.getParam("code_dialog_width", 600),height: a.getParam("code_dialog_height", Math.min(tinymce.DOM.getViewPort().h - 200, 500)),resizable:!0,maximizable:!0,buttons:[{text:"Ok",subtype:"primary",onclick:function(){document.querySelectorAll(".mce-container-body>iframe")[0].contentWindow.submit();b.close()}},{text:"Cancel",onclick:"close"}]})}a.addButton("code",
-{title:"Source code",icon:"code",onclick:b});a.addMenuItem("code",{icon:"code",text:"Source code",context:"tools",onclick:b})});
+tinymce.PluginManager.add("codemirror", function(a, c) {
+ function b() {
+ a.focus();
+ a.selection.collapse(!0);
+ a.selection.setContent('�');
+ var b = a.windowManager.open({
+ title: "Source code", url: c + "/source.html", width: a.getParam("code_dialog_width", 600), height: a.getParam("code_dialog_height", Math.min(tinymce.DOM.getViewPort().h - 200, 500)), resizable: !0, maximizable: !0,
+ buttons: [
+ {
+ text: "Ok", subtype: "primary",
+ onclick: function() {
+ document.querySelectorAll(".mce-container-body>iframe")[0].contentWindow.submit();
+ b.close()
+ }
+ }, { text: "Cancel", onclick: "close" }
+ ]
+ })
+ }
+
+ a.addButton("codemirror",
+ { title: "Source code", icon: "code", onclick: b });
+ a.addMenuItem("codemirror", { icon: "code", text: "Source code", context: "tools", onclick: b })
+});
diff --git a/src/Umbraco.Web.UI/config/tinyMceConfig.config b/src/Umbraco.Web.UI/config/tinyMceConfig.config
index 43257ac797..a4cdb5f3f6 100644
--- a/src/Umbraco.Web.UI/config/tinyMceConfig.config
+++ b/src/Umbraco.Web.UI/config/tinyMceConfig.config
@@ -2,213 +2,220 @@
-
-
- code
- images/editor/code.gif
- code
- 1
-
-
- removeformat
- images/editor/removeformat.gif
- removeformat
- 2
-
+
+
+ code
+ images/editor/code.gif
+ code
+ 1
+
+
+ codemirror
+ images/editor/code.gif
+ codemirror
+ 1
+
+
+ removeformat
+ images/editor/removeformat.gif
+ removeformat
+ 2
+
-
- Undo
- images/editor/undo.gif
- undo
- 11
-
-
- Redo
- images/editor/redo.gif
- redo
- 12
-
-
- Cut
- images/editor/cut.gif
- cut
- 13
-
-
- Copy
- images/editor/copy.gif
- copy
- 14
-
-
-
- styleselect
- images/editor/showStyles.png
- styleselect
- 20
-
-
- bold
- images/editor/bold.gif
- bold
- 21
-
-
- italic
- images/editor/italic.gif
- italic
- 22
-
-
- Underline
- images/editor/underline.gif
- underline
- 23
-
-
- Strikethrough
- images/editor/strikethrough.gif
- strikethrough
- 24
-
+
+ Undo
+ images/editor/undo.gif
+ undo
+ 11
+
+
+ Redo
+ images/editor/redo.gif
+ redo
+ 12
+
+
+ Cut
+ images/editor/cut.gif
+ cut
+ 13
+
+
+ Copy
+ images/editor/copy.gif
+ copy
+ 14
+
-
- JustifyLeft
- images/editor/justifyleft.gif
- justifyleft
- 31
-
-
- JustifyCenter
- images/editor/justifycenter.gif
- justifycenter
- 32
-
-
- JustifyRight
- images/editor/justifyright.gif
- justifyright
- 33
-
-
- JustifyFull
- images/editor/justifyfull.gif
- alignjustify
- 34
-
+
+ styleselect
+ images/editor/showStyles.png
+ styleselect
+ 20
+
+
+ bold
+ images/editor/bold.gif
+ bold
+ 21
+
+
+ italic
+ images/editor/italic.gif
+ italic
+ 22
+
+
+ Underline
+ images/editor/underline.gif
+ underline
+ 23
+
+
+ Strikethrough
+ images/editor/strikethrough.gif
+ strikethrough
+ 24
+
-
- bullist
- images/editor/bullist.gif
- bullist
- 41
-
-
- numlist
- images/editor/numlist.gif
- numlist
- 42
-
-
- Outdent
- images/editor/outdent.gif
- outdent
- 43
-
-
- Indent
- images/editor/indent.gif
- indent
- 44
-
+
+ JustifyLeft
+ images/editor/justifyleft.gif
+ justifyleft
+ 31
+
+
+ JustifyCenter
+ images/editor/justifycenter.gif
+ justifycenter
+ 32
+
+
+ JustifyRight
+ images/editor/justifyright.gif
+ justifyright
+ 33
+
+
+ JustifyFull
+ images/editor/justifyfull.gif
+ alignjustify
+ 34
+
-
- mceLink
- images/editor/link.gif
- link
- 51
-
-
- unlink
- images/editor/unLink.gif
- unlink
- 52
-
-
- mceInsertAnchor
- images/editor/anchor.gif
- anchor
- 53
-
+
+ bullist
+ images/editor/bullist.gif
+ bullist
+ 41
+
+
+ numlist
+ images/editor/numlist.gif
+ numlist
+ 42
+
+
+ Outdent
+ images/editor/outdent.gif
+ outdent
+ 43
+
+
+ Indent
+ images/editor/indent.gif
+ indent
+ 44
+
-
- mceImage
- images/editor/image.gif
- image
- 61
-
+
+ mceLink
+ images/editor/link.gif
+ link
+ 51
+
+
+ unlink
+ images/editor/unLink.gif
+ unlink
+ 52
+
+
+ mceInsertAnchor
+ images/editor/anchor.gif
+ anchor
+ 53
+
-
- umbracomacro
- images/editor/insMacro.gif
- umbracomacro
- 62
-
-
-
-
-
- mceInsertTable
- images/editor/table.gif
- table
- 63
-
-
-
- umbracoembed
- images/editor/media.gif
- umbracoembed
- 66
-
-
- inserthorizontalrule
- images/editor/hr.gif
- hr
- 71
-
-
- subscript
- images/editor/sub.gif
- subscript
- 72
-
+
+ mceImage
+ images/editor/image.gif
+ image
+ 61
+
-
- superscript
- images/editor/sup.gif
- superscript
- 73
-
+
+ umbracomacro
+ images/editor/insMacro.gif
+ umbracomacro
+ 62
+
-
- mceCharMap
- images/editor/charmap.gif
- charmap
- 74
-
-
-
-
- codemirror
- paste
- umbracolink
- anchor
- charmap
- table
- lists
-
-
-
+ mceInsertTable
+ images/editor/table.gif
+ table
+ 63
+
+
+
+ umbracoembed
+ images/editor/media.gif
+ umbracoembed
+ 66
+
+
+ inserthorizontalrule
+ images/editor/hr.gif
+ hr
+ 71
+
+
+ subscript
+ images/editor/sub.gif
+ subscript
+ 72
+
+
+
+ superscript
+ images/editor/sup.gif
+ superscript
+ 73
+
+
+
+ mceCharMap
+ images/editor/charmap.gif
+ charmap
+ 74
+
+
+
+
+ code
+ codemirror
+ paste
+ umbracolink
+ anchor
+ charmap
+ table
+ lists
+
+
+
-
- font
+
+ font
-
-
-
- raw
-
- {
- "indentOnInit": false,
- "path": "../../../../../umbraco_client/CodeMirror/Js",
- "config": {
- },
- "jsFiles": [
- ],
- "cssFiles": [
- ]
- }
-
-
+
+
+
+ raw
+
+ {
+ "indentOnInit": false,
+ "path": "../../../../../umbraco_client/CodeMirror/Js",
+ "config": {
+ },
+ "jsFiles": [
+ ],
+ "cssFiles": [
+ ]
+ }
+
+
\ No newline at end of file