From 3d0e74522dba939a344bb63221c43f0032ff460f Mon Sep 17 00:00:00 2001 From: Jeremy Pyne Date: Fri, 5 Sep 2014 15:32:39 -0400 Subject: [PATCH] Fix for dialog size logic. Fix for css not associated with legend. --- .../tinymce/plugins/codemirror/plugin.min.js | 2 +- .../tinymce/plugins/codemirror/source.html | 25 +++++-------------- 2 files changed, 7 insertions(+), 20 deletions(-) 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 2159c8536b..425083626d 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,3 @@ 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:"HTML source code",url:c+"/source.html",width:800,height:550,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", +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})}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/source.html b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/source.html index f91a50625d..6a4cd7ba57 100755 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/source.html +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/source.html @@ -117,12 +117,14 @@ function start() // Create legend for keyboard shortcuts for find & replace: var head = parent.document.querySelectorAll('.mce-foot')[0], div = parent.document.createElement('div'), - td1 = '', - td2 = ''; + td1 = '', + td2 = ''; div.innerHTML = '' + td1 + (isMac ? '⌘-F' : 'Ctrl-F') + td2 + tinymce.translate('Start search') + '' + td1 + (isMac ? '⌘-G' : 'Ctrl-G') + '' + td2 + tinymce.translate('Find next') + '' + td1 + (isMac ? '⌘-Alt-F' : 'Shift-Ctrl-F') + '' + td2 + tinymce.translate('Find previous') + '' + '' + td1 + (isMac ? '⌘-Alt-F' : 'Shift-Ctrl-F') + '' + td2 + tinymce.translate('Replace') + '' + td1 + (isMac ? 'Shift-⌘-Alt-F' : 'Shift-Ctrl-R') +'' + td2 + tinymce.translate('Replace all') + '
'; - div.className="search-legend"; + div.style.position = 'absolute'; + div.style.left = '1em'; + div.style.bottom = '.5em'; head.appendChild(div); - + // Set CodeMirror cursor to same position as cursor was in TinyMCE: var html = editor.getContent({source_view: true}); html = html.replace(/]*)>([^<]*)<\/span>/gm, String.fromCharCode(chr)); @@ -235,21 +237,6 @@ body { background: #e8f2ff !important; } -.search-legend td.description, .search-legend td.shortcut { -font-size: 11px; -padding-right: 1em; -} -.search-legend td.shortcut { -font-family: courier; -font-weight: bold; -text-align: right; -} -.search-legend { -position: absolute; -left: 1em; -bottom: .5em; -} -