From efe8fd4694ce1d5252af9856b2bfac396e76c8f9 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sat, 6 Dec 2014 23:53:22 +0000 Subject: [PATCH] TinyMCE, improve accessibility: - Return focus to the editor on pressing Escape while the image toolbar is focused. - Add a Close button to the Help modal and close it on Escape. - Override the title on the editor iframe (read by screen reader apps), replace with the Alt+Shift+H shortcut. - Add focus shortcuts descriptions to the Help modal. Fixes #27642. Built from https://develop.svn.wordpress.org/trunk@30757 git-svn-id: http://core.svn.wordpress.org/trunk@30747 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-editor.php | 2 +- .../js/tinymce/plugins/wordpress/plugin.js | 4 ++-- .../tinymce/plugins/wordpress/plugin.min.js | 2 +- .../js/tinymce/plugins/wpeditimage/plugin.js | 14 ++++++++++---- .../tinymce/plugins/wpeditimage/plugin.min.js | 2 +- wp-includes/js/tinymce/wp-mce-help.php | 14 ++++++++++++-- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 136170 -> 136188 bytes wp-includes/version.php | 2 +- 8 files changed, 28 insertions(+), 12 deletions(-) diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php index 6a90cde8f2..938787d5c5 100644 --- a/wp-includes/class-wp-editor.php +++ b/wp-includes/class-wp-editor.php @@ -977,7 +977,7 @@ final class _WP_Editors { /* translators: word count */ 'Words: {0}' => sprintf( __( 'Words: %s' ), '{0}' ), 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' => __( 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' ) . "\n\n" . __( 'If you’re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically.' ), - 'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' => __( 'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' ), + 'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' => __( 'Rich Text Area. Press Alt-Shift-H for help' ), 'You have unsaved changes are you sure you want to navigate away?' => __( 'The changes you made will be lost if you navigate away from this page.' ), 'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' => __( 'Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser’s edit menu instead.' ), diff --git a/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/wp-includes/js/tinymce/plugins/wordpress/plugin.js index 004f19f614..f3af6490ce 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -193,8 +193,8 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { title: 'Keyboard Shortcuts', width: 450, height: 420, - inline: 1, - classes: 'wp-help' + classes: 'wp-help', + buttons: { text: 'Close', onclick: 'close' } }); }); diff --git a/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js b/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js index 28505cc631..2575374bf3 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js @@ -1 +1 @@ -tinymce.ui.FloatPanel.zIndex=100100,tinymce.PluginManager.add("wordpress",function(a){function b(b){var c,d,e,f=0;d="hide"===b,a.theme.panel&&(e=a.theme.panel.find(".toolbar:not(.menubar)")),!e||e.length<2||"hide"===b&&!e[1].visible()||(!b&&e[1].visible()&&(b="hide"),tinymce.each(e,function(a,c){c>0&&("hide"===b?(a.hide(),f+=30):(a.show(),f-=30))}),f&&!d&&(tinymce.Env.iOS||(c=a.getContentAreaContainer().firstChild,j.setStyle(c,"height",c.clientHeight+f)),"hide"===b?(setUserSetting("hidetb","0"),g&&g.active(!1)):(setUserSetting("hidetb","1"),g&&g.active(!0))),a.fire("wp-toolbar-toggle"))}function c(a){return a.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(a,b){return''+b+''})}function d(a){return a.replace(/]+>/g,function(a){if(-1!==a.indexOf('class="wp-oembed')){var b=a.match(/alt="([^\"]+)"/);b[1]&&(a="[embed]"+b[1]+"[/embed]")}return a})}function e(b,c){var d,e,f,g,h;f=a.dom.getViewPort(a.getWin()),d=j.getPos(a.getContentAreaContainer()),e=a.dom.getPos(b),g=Math.max(e.x-f.x,0)+d.x,h=Math.max(e.y-f.y,0)+d.y,j.setStyles(c,{top:h+5+"px",left:g+5+"px",display:"block"})}function f(){j.hide(j.select("#wp_editbtns, #wp_gallerybtns"))}var g,h,i,j=tinymce.DOM,k=0;return"undefined"!=typeof window.jQuery&&window.jQuery(document).triggerHandler("tinymce-editor-setup",[a]),a.addButton("wp_adv",{tooltip:"Toolbar Toggle",cmd:"WP_Adv",onPostRender:function(){g=this,g.active("1"===getUserSetting("hidetb")?!0:!1)}}),a.on("PostRender",function(){a.getParam("wordpress_adv_hidden",!0)&&"0"===getUserSetting("hidetb","0")&&b("hide")}),a.addCommand("WP_Adv",function(){b()}),a.on("focus",function(){window.wpActiveEditor=a.id}),a.on("BeforeSetContent",function(b){var c;b.content&&(-1!==b.content.indexOf("/g,function(a,b){return''})),-1!==b.content.indexOf("")&&(c=a.editorManager.i18n.translate("Page break"),b.content=b.content.replace(//g,'')))}),a.on("PostProcess",function(a){a.get&&(a.content=a.content.replace(/]+>/g,function(a){var b,c="";return-1!==a.indexOf('data-wp-more="more"')?((b=a.match(/data-wp-more-text="([^"]+)"/))&&(c=b[1]),a=""):-1!==a.indexOf('data-wp-more="nextpage"')&&(a=""),a}))}),a.on("ResolveName",function(b){var c;"IMG"===b.target.nodeName&&(c=a.dom.getAttrib(b.target,"data-wp-more"))&&(b.name=c)}),a.addCommand("WP_More",function(b){var c,d,e,f="wp-more-tag",g=a.dom,h=a.selection.getNode();return b=b||"more",f+=" mce-wp-"+b,e="more"===b?"Read more...":"Next page",e=a.editorManager.i18n.translate(e),d='',"BODY"===h.nodeName||"P"===h.nodeName&&"BODY"===h.parentNode.nodeName?void a.insertContent(d):(c=g.getParent(h,function(a){return a.parentNode&&"BODY"===a.parentNode.nodeName?!0:!1},a.getBody()),void(c&&("P"===c.nodeName?c.appendChild(g.create("p",null,d).firstChild):g.insertAfter(g.create("p",null,d),c),a.nodeChanged())))}),a.addCommand("WP_Code",function(){a.formatter.toggle("code")}),a.addCommand("WP_Page",function(){a.execCommand("WP_More","nextpage")}),a.addCommand("WP_Help",function(){a.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",title:"Keyboard Shortcuts",width:450,height:420,inline:1,classes:"wp-help"})}),a.addCommand("WP_Medialib",function(){"undefined"!=typeof wp&&wp.media&&wp.media.editor&&wp.media.editor.open(a.id)}),a.addButton("wp_more",{tooltip:"Insert Read More tag",onclick:function(){a.execCommand("WP_More","more")}}),a.addButton("wp_page",{tooltip:"Page break",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.addButton("wp_help",{tooltip:"Keyboard Shortcuts",cmd:"WP_Help"}),a.addButton("wp_code",{tooltip:"Code",cmd:"WP_Code",stateSelector:"code"}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&a.addMenuItem("add_media",{text:"Add Media",icon:"wp-media-library",context:"insert",cmd:"WP_Medialib"}),a.addMenuItem("wp_more",{text:"Insert Read More tag",icon:"wp_more",context:"insert",onclick:function(){a.execCommand("WP_More","more")}}),a.addMenuItem("wp_page",{text:"Page break",icon:"wp_page",context:"insert",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.on("BeforeExecCommand",function(b){!tinymce.Env.webkit||"InsertUnorderedList"!==b.command&&"InsertOrderedList"!==b.command||(i||(i=a.dom.create("style",{type:"text/css"},"#tinymce,#tinymce span,#tinymce li,#tinymce li>span,#tinymce p,#tinymce p>span{font:medium sans-serif;color:#000;line-height:normal;}")),a.getDoc().head.appendChild(i))}),a.on("ExecCommand",function(b){tinymce.Env.webkit&&i&&("InsertUnorderedList"===b.command||"InsertOrderedList"===b.command)&&a.dom.remove(i)}),a.on("init",function(){var b=tinymce.Env,c=["mceContentBody"],d=a.getDoc(),e=a.dom;tinymce.Env.iOS&&e.addClass(d.documentElement,"ios"),"rtl"===a.getParam("directionality")&&(c.push("rtl"),e.setAttrib(d.documentElement,"dir","rtl")),b.ie?9===parseInt(b.ie,10)?c.push("ie9"):8===parseInt(b.ie,10)?c.push("ie8"):b.ie<8&&c.push("ie7"):b.webkit&&c.push("webkit"),c.push("wp-editor"),tinymce.each(c,function(a){a&&e.addClass(d.body,a)}),a.on("BeforeSetContent",function(a){a.content&&(a.content=a.content.replace(/

\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi,"<$1$2>"),a.content=a.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi,""))}),"undefined"!=typeof window.jQuery&&window.jQuery(document).triggerHandler("tinymce-editor-init",[a]),window.tinyMCEPreInit&&window.tinyMCEPreInit.dragDropUpload&&e.bind(d,"dragstart dragend dragover drop",function(a){"undefined"!=typeof window.jQuery&&window.jQuery(document).trigger(new window.jQuery.Event(a))}),a.getParam("wp_paste_filters",!0)&&(tinymce.Env.webkit||a.on("PastePreProcess",function(a){a.content=a.content.replace(/(<[^>]+) style="[^"]*"([^>]*>)/gi,"$1$2"),a.content=a.content.replace(/(<[^>]+) data-mce-style=([^>]+>)/gi,"$1 style=$2")}),a.on("PastePostProcess",function(a){tinymce.each(e.select("p",a.node),function(a){e.isEmpty(a)&&e.remove(a)})}))}),"undefined"!=typeof window.jQuery&&a.on("keyup",function(b){var c=b.keyCode||b.charCode;c!==k&&((13===c||8===k||46===k)&&window.jQuery(document).triggerHandler("wpcountwords",[a.getContent({format:"raw"})]),k=c)}),a.on("SaveContent",function(b){return!a.inline&&a.isHidden()?void(b.content=b.element.value):(b.content=b.content.replace(/

(?:
|\u00a0|\uFEFF| )*<\/p>/g,"

 

"),void(a.getParam("wpautop",!0)&&"undefined"!=typeof window.switchEditors&&(b.content=window.switchEditors.pre_wpautop(b.content))))}),a.on("BeforeSetContent",function(a){a.content&&(a.content=a.content.replace(/

(?: |\u00a0|\uFEFF| )+<\/p>/gi,"

"))}),a.on("preInit",function(){a.schema.addValidElements("@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b"),tinymce.Env.iOS&&(a.settings.height=300)}),h="alt+shift",a.addShortcut(h+"+c","","JustifyCenter"),a.addShortcut(h+"+r","","JustifyRight"),a.addShortcut(h+"+l","","JustifyLeft"),a.addShortcut(h+"+j","","JustifyFull"),a.addShortcut(h+"+q","","mceBlockQuote"),a.addShortcut(h+"+u","","InsertUnorderedList"),a.addShortcut(h+"+o","","InsertOrderedList"),a.addShortcut(h+"+n","","mceSpellCheck"),a.addShortcut(h+"+s","","unlink"),a.addShortcut(h+"+m","","WP_Medialib"),a.addShortcut(h+"+z","","WP_Adv"),a.addShortcut(h+"+t","","WP_More"),a.addShortcut(h+"+d","","Strikethrough"),a.addShortcut(h+"+h","","WP_Help"),a.addShortcut(h+"+p","","WP_Page"),a.addShortcut(h+"+x","","WP_Code"),a.addShortcut("ctrl+s","",function(){"undefined"!=typeof wp&&wp.autosave&&wp.autosave.server.triggerSave()}),a.on("init",function(){a.dom.bind(a.getWin(),"scroll",function(){f()}),a.dom.bind(a.getBody(),"dragstart",function(){f()})}),a.on("BeforeExecCommand",function(){f()}),a.on("SaveContent",function(){f()}),a.on("MouseDown",function(a){"IMG"!==a.target.nodeName&&f()}),a.on("keydown",function(a){(a.which===tinymce.util.VK.DELETE||a.which===tinymce.util.VK.BACKSPACE)&&f()}),{_showButtons:e,_hideButtons:f,_setEmbed:c,_getEmbed:d}}); \ No newline at end of file +tinymce.ui.FloatPanel.zIndex=100100,tinymce.PluginManager.add("wordpress",function(a){function b(b){var c,d,e,f=0;d="hide"===b,a.theme.panel&&(e=a.theme.panel.find(".toolbar:not(.menubar)")),!e||e.length<2||"hide"===b&&!e[1].visible()||(!b&&e[1].visible()&&(b="hide"),tinymce.each(e,function(a,c){c>0&&("hide"===b?(a.hide(),f+=30):(a.show(),f-=30))}),f&&!d&&(tinymce.Env.iOS||(c=a.getContentAreaContainer().firstChild,j.setStyle(c,"height",c.clientHeight+f)),"hide"===b?(setUserSetting("hidetb","0"),g&&g.active(!1)):(setUserSetting("hidetb","1"),g&&g.active(!0))),a.fire("wp-toolbar-toggle"))}function c(a){return a.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(a,b){return''+b+''})}function d(a){return a.replace(/]+>/g,function(a){if(-1!==a.indexOf('class="wp-oembed')){var b=a.match(/alt="([^\"]+)"/);b[1]&&(a="[embed]"+b[1]+"[/embed]")}return a})}function e(b,c){var d,e,f,g,h;f=a.dom.getViewPort(a.getWin()),d=j.getPos(a.getContentAreaContainer()),e=a.dom.getPos(b),g=Math.max(e.x-f.x,0)+d.x,h=Math.max(e.y-f.y,0)+d.y,j.setStyles(c,{top:h+5+"px",left:g+5+"px",display:"block"})}function f(){j.hide(j.select("#wp_editbtns, #wp_gallerybtns"))}var g,h,i,j=tinymce.DOM,k=0;return"undefined"!=typeof window.jQuery&&window.jQuery(document).triggerHandler("tinymce-editor-setup",[a]),a.addButton("wp_adv",{tooltip:"Toolbar Toggle",cmd:"WP_Adv",onPostRender:function(){g=this,g.active("1"===getUserSetting("hidetb")?!0:!1)}}),a.on("PostRender",function(){a.getParam("wordpress_adv_hidden",!0)&&"0"===getUserSetting("hidetb","0")&&b("hide")}),a.addCommand("WP_Adv",function(){b()}),a.on("focus",function(){window.wpActiveEditor=a.id}),a.on("BeforeSetContent",function(b){var c;b.content&&(-1!==b.content.indexOf("/g,function(a,b){return''})),-1!==b.content.indexOf("")&&(c=a.editorManager.i18n.translate("Page break"),b.content=b.content.replace(//g,'')))}),a.on("PostProcess",function(a){a.get&&(a.content=a.content.replace(/]+>/g,function(a){var b,c="";return-1!==a.indexOf('data-wp-more="more"')?((b=a.match(/data-wp-more-text="([^"]+)"/))&&(c=b[1]),a=""):-1!==a.indexOf('data-wp-more="nextpage"')&&(a=""),a}))}),a.on("ResolveName",function(b){var c;"IMG"===b.target.nodeName&&(c=a.dom.getAttrib(b.target,"data-wp-more"))&&(b.name=c)}),a.addCommand("WP_More",function(b){var c,d,e,f="wp-more-tag",g=a.dom,h=a.selection.getNode();return b=b||"more",f+=" mce-wp-"+b,e="more"===b?"Read more...":"Next page",e=a.editorManager.i18n.translate(e),d='',"BODY"===h.nodeName||"P"===h.nodeName&&"BODY"===h.parentNode.nodeName?void a.insertContent(d):(c=g.getParent(h,function(a){return a.parentNode&&"BODY"===a.parentNode.nodeName?!0:!1},a.getBody()),void(c&&("P"===c.nodeName?c.appendChild(g.create("p",null,d).firstChild):g.insertAfter(g.create("p",null,d),c),a.nodeChanged())))}),a.addCommand("WP_Code",function(){a.formatter.toggle("code")}),a.addCommand("WP_Page",function(){a.execCommand("WP_More","nextpage")}),a.addCommand("WP_Help",function(){a.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",title:"Keyboard Shortcuts",width:450,height:420,classes:"wp-help",buttons:{text:"Close",onclick:"close"}})}),a.addCommand("WP_Medialib",function(){"undefined"!=typeof wp&&wp.media&&wp.media.editor&&wp.media.editor.open(a.id)}),a.addButton("wp_more",{tooltip:"Insert Read More tag",onclick:function(){a.execCommand("WP_More","more")}}),a.addButton("wp_page",{tooltip:"Page break",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.addButton("wp_help",{tooltip:"Keyboard Shortcuts",cmd:"WP_Help"}),a.addButton("wp_code",{tooltip:"Code",cmd:"WP_Code",stateSelector:"code"}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&a.addMenuItem("add_media",{text:"Add Media",icon:"wp-media-library",context:"insert",cmd:"WP_Medialib"}),a.addMenuItem("wp_more",{text:"Insert Read More tag",icon:"wp_more",context:"insert",onclick:function(){a.execCommand("WP_More","more")}}),a.addMenuItem("wp_page",{text:"Page break",icon:"wp_page",context:"insert",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.on("BeforeExecCommand",function(b){!tinymce.Env.webkit||"InsertUnorderedList"!==b.command&&"InsertOrderedList"!==b.command||(i||(i=a.dom.create("style",{type:"text/css"},"#tinymce,#tinymce span,#tinymce li,#tinymce li>span,#tinymce p,#tinymce p>span{font:medium sans-serif;color:#000;line-height:normal;}")),a.getDoc().head.appendChild(i))}),a.on("ExecCommand",function(b){tinymce.Env.webkit&&i&&("InsertUnorderedList"===b.command||"InsertOrderedList"===b.command)&&a.dom.remove(i)}),a.on("init",function(){var b=tinymce.Env,c=["mceContentBody"],d=a.getDoc(),e=a.dom;tinymce.Env.iOS&&e.addClass(d.documentElement,"ios"),"rtl"===a.getParam("directionality")&&(c.push("rtl"),e.setAttrib(d.documentElement,"dir","rtl")),b.ie?9===parseInt(b.ie,10)?c.push("ie9"):8===parseInt(b.ie,10)?c.push("ie8"):b.ie<8&&c.push("ie7"):b.webkit&&c.push("webkit"),c.push("wp-editor"),tinymce.each(c,function(a){a&&e.addClass(d.body,a)}),a.on("BeforeSetContent",function(a){a.content&&(a.content=a.content.replace(/

\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi,"<$1$2>"),a.content=a.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi,""))}),"undefined"!=typeof window.jQuery&&window.jQuery(document).triggerHandler("tinymce-editor-init",[a]),window.tinyMCEPreInit&&window.tinyMCEPreInit.dragDropUpload&&e.bind(d,"dragstart dragend dragover drop",function(a){"undefined"!=typeof window.jQuery&&window.jQuery(document).trigger(new window.jQuery.Event(a))}),a.getParam("wp_paste_filters",!0)&&(tinymce.Env.webkit||a.on("PastePreProcess",function(a){a.content=a.content.replace(/(<[^>]+) style="[^"]*"([^>]*>)/gi,"$1$2"),a.content=a.content.replace(/(<[^>]+) data-mce-style=([^>]+>)/gi,"$1 style=$2")}),a.on("PastePostProcess",function(a){tinymce.each(e.select("p",a.node),function(a){e.isEmpty(a)&&e.remove(a)})}))}),"undefined"!=typeof window.jQuery&&a.on("keyup",function(b){var c=b.keyCode||b.charCode;c!==k&&((13===c||8===k||46===k)&&window.jQuery(document).triggerHandler("wpcountwords",[a.getContent({format:"raw"})]),k=c)}),a.on("SaveContent",function(b){return!a.inline&&a.isHidden()?void(b.content=b.element.value):(b.content=b.content.replace(/

(?:
|\u00a0|\uFEFF| )*<\/p>/g,"

 

"),void(a.getParam("wpautop",!0)&&"undefined"!=typeof window.switchEditors&&(b.content=window.switchEditors.pre_wpautop(b.content))))}),a.on("BeforeSetContent",function(a){a.content&&(a.content=a.content.replace(/

(?: |\u00a0|\uFEFF| )+<\/p>/gi,"

"))}),a.on("preInit",function(){a.schema.addValidElements("@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b"),tinymce.Env.iOS&&(a.settings.height=300)}),h="alt+shift",a.addShortcut(h+"+c","","JustifyCenter"),a.addShortcut(h+"+r","","JustifyRight"),a.addShortcut(h+"+l","","JustifyLeft"),a.addShortcut(h+"+j","","JustifyFull"),a.addShortcut(h+"+q","","mceBlockQuote"),a.addShortcut(h+"+u","","InsertUnorderedList"),a.addShortcut(h+"+o","","InsertOrderedList"),a.addShortcut(h+"+n","","mceSpellCheck"),a.addShortcut(h+"+s","","unlink"),a.addShortcut(h+"+m","","WP_Medialib"),a.addShortcut(h+"+z","","WP_Adv"),a.addShortcut(h+"+t","","WP_More"),a.addShortcut(h+"+d","","Strikethrough"),a.addShortcut(h+"+h","","WP_Help"),a.addShortcut(h+"+p","","WP_Page"),a.addShortcut(h+"+x","","WP_Code"),a.addShortcut("ctrl+s","",function(){"undefined"!=typeof wp&&wp.autosave&&wp.autosave.server.triggerSave()}),a.on("init",function(){a.dom.bind(a.getWin(),"scroll",function(){f()}),a.dom.bind(a.getBody(),"dragstart",function(){f()})}),a.on("BeforeExecCommand",function(){f()}),a.on("SaveContent",function(){f()}),a.on("MouseDown",function(a){"IMG"!==a.target.nodeName&&f()}),a.on("keydown",function(a){(a.which===tinymce.util.VK.DELETE||a.which===tinymce.util.VK.BACKSPACE)&&f()}),{_showButtons:e,_hideButtons:f,_setEmbed:c,_getEmbed:d}}); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 2b2983efe4..9a19c7eb10 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -302,6 +302,12 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { }, delay ); } ); + function hide() { + if ( ! toolbarIsHidden ) { + floatingToolbar.hide(); + } + } + floatingToolbar.on( 'show', function() { var self = this; @@ -320,11 +326,11 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { DOM.removeClass( this.getEl(), 'mce-inline-toolbar-grp-active' ); } ); - function hide() { - if ( ! toolbarIsHidden ) { - floatingToolbar.hide(); + floatingToolbar.on( 'keydown', function( event ) { + if ( event.keyCode === 27 ) { + hide(); } - } + } ); DOM.bind( window, 'resize scroll', function() { if ( ! toolbarIsHidden && editorWrapParent.hasClass( 'wp-editor-expand' ) ) { diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js index 2902c101e4..0dfdbf288d 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wpeditimage",function(a){function b(b){return!(!a.dom.getAttrib(b,"data-mce-placeholder")&&!a.dom.getAttrib(b,"data-mce-object"))}function c(){var b,c=[];return r(["wp_img_alignleft","wp_img_aligncenter","wp_img_alignright","wp_img_alignnone","wp_img_edit","wp_img_remove"],function(d){function e(){var b=a.selection;d.settings.stateSelector&&b.selectorChanged(d.settings.stateSelector,function(a){d.active(a)},!0),d.settings.disabledStateSelector&&b.selectorChanged(d.settings.disabledStateSelector,function(a){d.disabled(a)})}var f;"|"===d?b=null:q.has(d)?(d={type:d},p.toolbar_items_size&&(d.size=p.toolbar_items_size),c.push(d),b=null):(b||(b={type:"buttongroup",items:[]},c.push(b)),a.buttons[d]&&(f=d,d=a.buttons[f],"function"==typeof d&&(d=d()),d.type=d.type||"button",p.toolbar_items_size&&(d.size=p.toolbar_items_size),d=q.create(d),b.items.push(d),a.initialized?e():a.on("init",e)))}),{type:"panel",layout:"stack",classes:"toolbar-grp inline-toolbar-grp wp-image-toolbar",ariaRoot:!0,ariaRemember:!0,items:[{type:"toolbar",layout:"flow",items:c}]}}function d(){t||m.hide()}function e(b){return b.replace(/(?:

)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g,function(b,c,d){var e,f,g,h,i,j,k=tinymce.trim;return e=c.match(/id=['"]([^'"]*)['"] ?/),e&&(c=c.replace(e[0],"")),f=c.match(/align=['"]([^'"]*)['"] ?/),f&&(c=c.replace(f[0],"")),g=c.match(/class=['"]([^'"]*)['"] ?/),g&&(c=c.replace(g[0],"")),j=c.match(/width=['"]([0-9]*)['"] ?/),j&&(c=c.replace(j[0],"")),d=k(d),i=d.match(/((?:]+>)?]+>(?:<\/a>)?)([\s\S]*)/i),i&&i[2]?(h=k(i[2]),i=k(i[1])):(h=k(c).replace(/caption=['"]/,"").replace(/['"]$/,""),i=d),e=e&&e[1]?e[1].replace(/[<>&]+/g,""):"",f=f&&f[1]?f[1]:"alignnone",g=g&&g[1]?" "+g[1].replace(/[<>&]+/g,""):"",!j&&i&&(j=i.match(/width=['"]([0-9]*)['"]/)),j&&j[1]&&(j=j[1]),j&&h?(j=parseInt(j,10),a.getParam("wpeditimage_html5_captions")||(j+=10),'

'+i+'
'+h+"
"):d})}function f(a){return a.replace(/
]*>([\s\S]+?)<\/div>/g,function(a,b){var c="";return-1===b.indexOf("]+>([\s\S]+?)<\/dd>/i),c&&c[1]?"

"+c[1]+"

":""):(c=b.replace(/\s*
]+)>\s*
]+>([\s\S]+?)<\/dt>\s*
]+>([\s\S]*?)<\/dd>\s*<\/dl>\s*/gi,function(a,b,c,d){var e,f,g,h;return h=c.match(/width="([0-9]*)"/),h=h&&h[1]?h[1]:"",h&&d?(e=b.match(/id="([^"]*)"/),e=e&&e[1]?e[1]:"",f=b.match(/class="([^"]*)"/),f=f&&f[1]?f[1]:"",g=f.match(/align[a-z]+/i)||"alignnone",f=f.replace(/wp-caption ?|align[a-z]+ ?/gi,""),f&&(f=' class="'+f+'"'),d=d.replace(/\r\n|\r/g,"\n").replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),d=d.replace(/\s*\n\s*/g,"
"),'[caption id="'+e+'" align="'+g+'" width="'+h+'"'+f+"]"+c+" "+d+"[/caption]"):c}),-1===c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

[\s\S]*<\/p>)?[\s\S]*/gi,"

$1

$2")),c)})}function g(b){var c,d,e,f,g,h,i,j,k=[],l=a.dom,m=/^\d+$/;return e={attachment_id:!1,size:"custom",caption:"",align:"none",extraClasses:"",link:!1,linkUrl:"",linkClassName:"",linkTargetBlank:!1,linkRel:"",title:""},e.url=l.getAttrib(b,"src"),e.alt=l.getAttrib(b,"alt"),e.title=l.getAttrib(b,"title"),i=l.getAttrib(b,"width"),j=l.getAttrib(b,"height"),(!m.test(i)||parseInt(i,10)<1)&&(i=b.naturalWidth||b.width),(!m.test(j)||parseInt(j,10)<1)&&(j=b.naturalHeight||b.height),e.customWidth=e.width=i,e.customHeight=e.height=j,c=tinymce.explode(b.className," "),d=[],tinymce.each(c,function(a){/^wp-image/.test(a)?e.attachment_id=parseInt(a.replace("wp-image-",""),10):/^align/.test(a)?e.align=a.replace("align",""):/^size/.test(a)?e.size=a.replace("size-",""):d.push(a)}),e.extraClasses=d.join(" "),f=l.getParents(b,".wp-caption"),f.length&&(f=f[0],c=f.className.split(" "),tinymce.each(c,function(a){/^align/.test(a)?e.align=a.replace("align",""):a&&"wp-caption"!==a&&k.push(a)}),e.captionClassName=k.join(" "),g=l.select("dd.wp-caption-dd",f),g.length&&(g=g[0],e.caption=a.serializer.serialize(g).replace(/]*>/g,"$&\n").replace(/^

/,"").replace(/<\/p>$/,""))),b.parentNode&&"A"===b.parentNode.nodeName&&(h=b.parentNode,e.linkUrl=l.getAttrib(h,"href"),e.linkTargetBlank="_blank"===l.getAttrib(h,"target")?!0:!1,e.linkRel=l.getAttrib(h,"rel"),e.linkClassName=h.className),e}function h(a){return a&&!(!a.textContent&&!a.innerText)}function i(b){return!b||-1===b.indexOf("<")&&-1===b.indexOf(">")?b:(n||(n=new tinymce.html.Serializer({},a.schema)),n.serialize(a.parser.parse(b,{forced_root_block:!1})))}function j(b,c){var d,e,f,g,j,k,l,m,n,o,p,q,r,s,t,u,v=a.dom;d=tinymce.explode(c.extraClasses," "),d||(d=[]),c.caption||d.push("align"+c.align),c.attachment_id&&(d.push("wp-image-"+c.attachment_id),c.size&&"custom"!==c.size&&d.push("size-"+c.size)),s=c.width,t=c.height,"custom"===c.size&&(s=c.customWidth,t=c.customHeight),q={src:c.url,width:s||null,height:t||null,alt:c.alt,title:c.title||null,"class":d.join(" ")||null},v.setAttribs(b,q),r={href:c.linkUrl,rel:c.linkRel||null,target:c.linkTargetBlank?"_blank":null,"class":c.linkClassName||null},b.parentNode&&"A"===b.parentNode.nodeName&&!h(b.parentNode)?c.linkUrl?v.setAttribs(b.parentNode,r):v.remove(b.parentNode,!0):c.linkUrl&&((l=v.getParent(b,"a"))&&v.insertAfter(b,l),l=v.create("a",r),b.parentNode.insertBefore(l,b),l.appendChild(b)),m=a.dom.getParent(b,".mceTemp"),f=b.parentNode&&"A"===b.parentNode.nodeName&&!h(b.parentNode)?b.parentNode:b,c.caption?(c.caption=i(c.caption),p=c.attachment_id?"attachment_"+c.attachment_id:null,u="align"+(c.align||"none"),e="wp-caption "+u,c.captionClassName&&(e+=" "+c.captionClassName.replace(/[<>&]+/g,"")),a.getParam("wpeditimage_html5_captions")||(s=parseInt(s,10),s+=10),m?(o=v.select("dl.wp-caption",m),o.length&&v.setAttribs(o,{id:p,"class":e,style:"width: "+s+"px"}),n=v.select(".wp-caption-dd",m),n.length&&v.setHTML(n[0],c.caption)):(p=p?'id="'+p+'" ':"",g="

'+c.caption+"
",k=v.create("div",{"class":"mceTemp"},g),(j=v.getParent(f,"p"))?(j.parentNode.insertBefore(k,j),v.isEmpty(j)&&v.remove(j)):f.parentNode.insertBefore(k,f),a.$(k).find("dt.wp-caption-dt").append(f))):m&&(j=v.create("p"),m.parentNode.insertBefore(j,m),j.appendChild(f),v.remove(m)),wp.media.events&&wp.media.events.trigger("editor:image-update",{editor:a,metadata:c,image:b}),a.nodeChanged()}function k(b){var c,d,e;return"undefined"!=typeof wp&&wp.media?(e=g(b),wp.media.events.trigger("editor:image-edit",{editor:a,metadata:e,image:b}),c=wp.media({frame:"image",state:"image-details",metadata:e}),wp.media.events.trigger("editor:frame-create",{frame:c}),d=function(d){a.focus(),a.undoManager.transact(function(){j(b,d)}),c.detach()},c.state("image-details").on("update",d),c.state("replace-image").on("replace",d),c.on("close",function(){a.focus(),c.detach()}),void c.open()):void a.execCommand("mceImage")}function l(b){var c;"DIV"===b.nodeName&&a.dom.hasClass(b,"mceTemp")?c=b:("IMG"===b.nodeName||"DT"===b.nodeName||"A"===b.nodeName)&&(c=a.dom.getParent(b,"div.mceTemp")),c?(a.selection.select(c.nextSibling?c.nextSibling:c.previousSibling?c.previousSibling:c.parentNode),a.selection.collapse(!0),a.dom.remove(c)):a.dom.remove(b),a.nodeChanged(),a.undoManager.add()}var m,n,o=tinymce.DOM,p=a.settings,q=tinymce.ui.Factory,r=tinymce.each,s=tinymce.Env.iOS,t=!0,u=tinymce.$("#postdivrich");return a.addButton("wp_img_remove",{tooltip:"Remove",icon:"dashicon dashicons-no",onclick:function(){l(a.selection.getNode())}}),a.addButton("wp_img_edit",{tooltip:"Edit",icon:"dashicon dashicons-edit",onclick:function(){k(a.selection.getNode())}}),r({alignleft:"Align left",aligncenter:"Align center",alignright:"Align right",alignnone:"No alignment"},function(b,c){var d=c.slice(5);a.addButton("wp_img_"+c,{tooltip:b,icon:"dashicon dashicons-align-"+d,cmd:"alignnone"===c?"wpAlignNone":"Justify"+d.slice(0,1).toUpperCase()+d.slice(1),onPostRender:function(){var b=this;a.on("NodeChange",function(d){var e;"IMG"===d.element.nodeName&&(e=a.dom.getParent(d.element,".wp-caption")||d.element,b.active("alignnone"===c?!/\balign(left|center|right)\b/.test(e.className):a.dom.hasClass(e,c)))})}})}),m=q.create(c()).renderTo(document.body).hide(),m.reposition=function(){var b,c,d,e,f,g,h,i,j,k,l,m,n,p,q,r,t,u,v,w,x,y=this.getEl(),z=5,A=8,B=0,C=a.selection.getNode();return C&&"IMG"===C.nodeName?(f=window.pageYOffset||document.documentElement.scrollTop,g=tinymce.$("#wpadminbar")[0],h=tinymce.$(".mce-tinymce .mce-toolbar-grp")[0],i=C.getBoundingClientRect(),j=(i.left+i.right)/2,k=(i.top+i.bottom)/2,l=i.top,m=v-i.bottom,n=window.innerWidth,p=y.offsetWidth,q=p/2,r=a.getContentAreaContainer().firstChild,t=o.getPos(r),u=r.offsetWidth,v=r.offsetHeight,w=y.offsetHeight,x=w+A+z,s?b=i.top+t.y+A:l>=x?(e=" mce-arrow-down",b=i.top+t.y-w-A):m>=x?(e=" mce-arrow-up",b=i.bottom+t.y):(b=z,e=k>=x?" mce-arrow-down":" mce-arrow-up"),d=h?o.getPos(h).y+h.clientHeight:t.y,f&&(g&&0===g.getBoundingClientRect().top&&(B=g.clientHeight),f+B>d&&(d=f+B)),b&&d&&d+z>b&&(b=d+z,e=""),c=j-q,c+=t.x,p>=n?(e+=" mce-arrow-full",c=0):0>c&&i.left+p>n||c+p>n&&i.right-p<0?c=(n-p)/2:cu+t.x&&(e+=" mce-arrow-right",c=i.right-p+t.x),s||(y.className=y.className.replace(/ ?mce-arrow-[\w]+/g,""),y.className+=e),o.setStyles(y,{left:c,top:b}),this):this},s&&a.on("click",function(b){if("IMG"===b.target.nodeName){var c=b.target;window.setTimeout(function(){a.selection.select(c)},200)}else m.hide()}),a.on("nodechange",function(c){var d=s?350:100;return"IMG"!==c.element.nodeName||b(c.element)?void m.hide():void setTimeout(function(){var c=a.selection.getNode();"IMG"!==c.nodeName||b(c)?m.hide():m._visible?m.reposition():m.show()},d)}),m.on("show",function(){var a=this;t=!1,setTimeout(function(){a._visible&&(o.addClass(a.getEl(),"mce-inline-toolbar-grp-active"),a.reposition())},100)}),m.on("hide",function(){t=!0,o.removeClass(this.getEl(),"mce-inline-toolbar-grp-active")}),o.bind(window,"resize scroll",function(){!t&&u.hasClass("wp-editor-expand")&&d()}),a.on("init",function(){a.dom.bind(a.getWin(),"scroll",d)}),a.on("blur hide",d),a.shortcuts.add("Alt+119","",function(){var a=m.find("toolbar")[0];a&&a.focus(!0)}),a.on("init",function(){var b=a.dom,c=a.getParam("wpeditimage_html5_captions")?"html5-captions":"html4-captions";b.addClass(a.getBody(),c),a.on("wpLoadImageForm",function(b){if(!a.getParam("wpeditimage_disable_captions")){var c={type:"textbox",flex:1,name:"caption",minHeight:60,multiline:!0,scroll:!0,label:"Image caption"};b.data.splice(b.data.length-1,0,c)}}),a.on("wpNewImageRefresh",function(a){var c,d;(c=b.getParent(a.node,"dl.wp-caption"))&&(c.style.width||(d=parseInt(a.node.clientWidth,10)+10,d=d?d+"px":"50%",b.setStyle(c,"width",d)))}),a.on("wpImageFormSubmit",function(c){var d,e,f,g,h,j=c.imgData.data,k=c.imgData.node,l=c.imgData.caption,m="",n="",o="";return j.id="__wp-temp-img-id",c.imgData.cancel=!0,j.style||(j.style=null),j.src?(l&&(l=l.replace(/\r\n|\r/g,"\n").replace(/<\/?[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),l=l.replace(/(]*>)\s*\n\s*/g,"$1").replace(/\s*\n\s*/g,"
"),l=i(l)),k?(h=k.id||null,b.setAttribs(k,j),d=b.getParent(k,"dl.wp-caption"),l?d?(e=b.select("dd.wp-caption-dd",d)[0])&&(e.innerHTML=l):(k.className&&(m=k.className.match(/wp-image-([0-9]+)/),n=k.className.match(/align(left|right|center|none)/)),n?(n=n[0],k.className=k.className.replace(/align(left|right|center|none)/g,"")):n="alignnone",n=' class="wp-caption '+n+'"',m&&(m=' id="attachment_'+m[1]+'"'),o=j.width||k.clientWidth,o&&(o=parseInt(o,10),a.getParam("wpeditimage_html5_captions")||(o+=10),o=' style="width: '+o+'px"'),f=k.parentNode&&"A"===k.parentNode.nodeName?k.parentNode:k,g="
'+l+"
",d=b.create("div",{"class":"mceTemp"},g),(e=b.getParent(f,"p"))?(e.parentNode.insertBefore(d,e),b.isEmpty(e)&&b.remove(e)):f.parentNode.insertBefore(d,f),a.$(d).find("dt.wp-caption-dt").append(f)):d&&(g=b.getOuterHTML("A"===k.parentNode.nodeName?k.parentNode:k),e=b.create("p",{},g),b.insertAfter(e,d.parentNode),a.selection.select(e),a.nodeChanged(),b.remove(d.parentNode))):(g=b.createHTML("img",j),l?(f=a.selection.getNode(),j.width&&(o=parseInt(j.width,10),a.getParam("wpeditimage_html5_captions")||(o+=10),o=' style="width: '+o+'px"'),g='
'+g+'
'+l+"
",e="P"===f.nodeName?f:b.getParent(f,"p"),e&&"P"===e.nodeName?(d=b.create("div",{"class":"mceTemp"},g),e.parentNode.insertBefore(d,e),a.selection.select(d),a.nodeChanged(),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('
'+g+"
")):a.selection.setContent(g)),k=b.get("__wp-temp-img-id"),b.setAttrib(k,"id",h),void(c.imgData.node=k)):void(k&&(b.remove((d=b.getParent(k,"div.mceTemp"))?d:"A"===k.parentNode.nodeName?k.parentNode:k),a.nodeChanged()))}),a.on("wpLoadImageData",function(c){var d,e=c.imgData.data,f=c.imgData.node;(d=b.getParent(f,"dl.wp-caption"))&&(d=b.select("dd.wp-caption-dd",d)[0],d&&(e.caption=a.serializer.serialize(d).replace(/]*>/g,"$&\n").replace(/^

/,"").replace(/<\/p>$/,"")))}),b.bind(a.getDoc(),"dragstart",function(c){var d=a.selection.getNode();"IMG"===d.nodeName&&b.getParent(d,".wp-caption")&&c.preventDefault()}),tinymce.Env.ie&&tinymce.Env.ie>10&&b.bind(a.getBody(),"mscontrolselect",function(c){"IMG"===c.target.nodeName&&b.getParent(c.target,".wp-caption")?a.getBody().focus():"DL"===c.target.nodeName&&b.hasClass(c.target,"wp-caption")&&c.target.focus()})}),a.on("ObjectResized",function(b){var c=b.target;"IMG"===c.nodeName&&a.undoManager.transact(function(){var d,e,f=a.dom;c.className=c.className.replace(/\bsize-[^ ]+/,""),(d=f.getParent(c,".wp-caption"))&&(e=b.width||f.getAttrib(c,"width"),e&&(e=parseInt(e,10),a.getParam("wpeditimage_html5_captions")||(e+=10),f.setStyle(d,"width",e+"px")))})}),a.on("BeforeExecCommand",function(b){var c,d,e,f,g,h=b.command,i=a.dom;if("mceInsertContent"===h)(c=i.getParent(a.selection.getNode(),"div.mceTemp"))&&(d=i.create("p"),i.insertAfter(d,c),a.selection.setCursorLocation(d,0),a.nodeChanged());else if("JustifyLeft"===h||"JustifyRight"===h||"JustifyCenter"===h||"wpAlignNone"===h){if(c=a.selection.getNode(),f="align"+h.slice(7).toLowerCase(),e=a.dom.getParent(c,".wp-caption"),"IMG"!==c.nodeName&&!e)return;c=e||c,g=a.dom.hasClass(c,f)?" alignnone":" "+f,c.className=c.className.replace(/ ?align(left|center|right|none)/g,"")+g,a.nodeChanged(),b.preventDefault(),m&&m.reposition(),a.fire("ExecCommand",{command:h,ui:b.ui,value:b.value})}}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,h=b.keyCode,i=a.dom,j=tinymce.util.VK;if(h===j.ENTER)c=g.getNode(),d=i.getParent(c,"div.mceTemp"),d&&(i.events.cancel(b),tinymce.each(i.select("dt, dd",d),function(a){i.isEmpty(a)&&i.remove(a)}),f=tinymce.Env.ie&&tinymce.Env.ie<11?"":'
',e=i.create("p",null,f),"DD"===c.nodeName?i.insertAfter(e,d):d.parentNode.insertBefore(e,d),a.nodeChanged(),g.setCursorLocation(e,0));else if((h===j.DELETE||h===j.BACKSPACE)&&(c=g.getNode(),"DIV"===c.nodeName&&i.hasClass(c,"mceTemp")?d=c:("IMG"===c.nodeName||"DT"===c.nodeName||"A"===c.nodeName)&&(d=i.getParent(c,"div.mceTemp")),d))return i.events.cancel(b),l(c),!1}),tinymce.Env.gecko&&a.on("undo redo",function(){"IMG"===a.selection.getNode().nodeName&&a.selection.collapse()}),a.wpSetImgCaption=function(a){return e(a)},a.wpGetImgCaption=function(a){return f(a)},a.on("BeforeSetContent",function(b){"raw"!==b.format&&(b.content=a.wpSetImgCaption(b.content))}),a.on("PostProcess",function(b){b.get&&(b.content=a.wpGetImgCaption(b.content))}),{_do_shcode:e,_get_shcode:f}}); \ No newline at end of file +tinymce.PluginManager.add("wpeditimage",function(a){function b(b){return!(!a.dom.getAttrib(b,"data-mce-placeholder")&&!a.dom.getAttrib(b,"data-mce-object"))}function c(){var b,c=[];return r(["wp_img_alignleft","wp_img_aligncenter","wp_img_alignright","wp_img_alignnone","wp_img_edit","wp_img_remove"],function(d){function e(){var b=a.selection;d.settings.stateSelector&&b.selectorChanged(d.settings.stateSelector,function(a){d.active(a)},!0),d.settings.disabledStateSelector&&b.selectorChanged(d.settings.disabledStateSelector,function(a){d.disabled(a)})}var f;"|"===d?b=null:q.has(d)?(d={type:d},p.toolbar_items_size&&(d.size=p.toolbar_items_size),c.push(d),b=null):(b||(b={type:"buttongroup",items:[]},c.push(b)),a.buttons[d]&&(f=d,d=a.buttons[f],"function"==typeof d&&(d=d()),d.type=d.type||"button",p.toolbar_items_size&&(d.size=p.toolbar_items_size),d=q.create(d),b.items.push(d),a.initialized?e():a.on("init",e)))}),{type:"panel",layout:"stack",classes:"toolbar-grp inline-toolbar-grp wp-image-toolbar",ariaRoot:!0,ariaRemember:!0,items:[{type:"toolbar",layout:"flow",items:c}]}}function d(){t||m.hide()}function e(b){return b.replace(/(?:

)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g,function(b,c,d){var e,f,g,h,i,j,k=tinymce.trim;return e=c.match(/id=['"]([^'"]*)['"] ?/),e&&(c=c.replace(e[0],"")),f=c.match(/align=['"]([^'"]*)['"] ?/),f&&(c=c.replace(f[0],"")),g=c.match(/class=['"]([^'"]*)['"] ?/),g&&(c=c.replace(g[0],"")),j=c.match(/width=['"]([0-9]*)['"] ?/),j&&(c=c.replace(j[0],"")),d=k(d),i=d.match(/((?:]+>)?]+>(?:<\/a>)?)([\s\S]*)/i),i&&i[2]?(h=k(i[2]),i=k(i[1])):(h=k(c).replace(/caption=['"]/,"").replace(/['"]$/,""),i=d),e=e&&e[1]?e[1].replace(/[<>&]+/g,""):"",f=f&&f[1]?f[1]:"alignnone",g=g&&g[1]?" "+g[1].replace(/[<>&]+/g,""):"",!j&&i&&(j=i.match(/width=['"]([0-9]*)['"]/)),j&&j[1]&&(j=j[1]),j&&h?(j=parseInt(j,10),a.getParam("wpeditimage_html5_captions")||(j+=10),'

'+i+'
'+h+"
"):d})}function f(a){return a.replace(/
]*>([\s\S]+?)<\/div>/g,function(a,b){var c="";return-1===b.indexOf("]+>([\s\S]+?)<\/dd>/i),c&&c[1]?"

"+c[1]+"

":""):(c=b.replace(/\s*
]+)>\s*
]+>([\s\S]+?)<\/dt>\s*
]+>([\s\S]*?)<\/dd>\s*<\/dl>\s*/gi,function(a,b,c,d){var e,f,g,h;return h=c.match(/width="([0-9]*)"/),h=h&&h[1]?h[1]:"",h&&d?(e=b.match(/id="([^"]*)"/),e=e&&e[1]?e[1]:"",f=b.match(/class="([^"]*)"/),f=f&&f[1]?f[1]:"",g=f.match(/align[a-z]+/i)||"alignnone",f=f.replace(/wp-caption ?|align[a-z]+ ?/gi,""),f&&(f=' class="'+f+'"'),d=d.replace(/\r\n|\r/g,"\n").replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),d=d.replace(/\s*\n\s*/g,"
"),'[caption id="'+e+'" align="'+g+'" width="'+h+'"'+f+"]"+c+" "+d+"[/caption]"):c}),-1===c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

[\s\S]*<\/p>)?[\s\S]*/gi,"

$1

$2")),c)})}function g(b){var c,d,e,f,g,h,i,j,k=[],l=a.dom,m=/^\d+$/;return e={attachment_id:!1,size:"custom",caption:"",align:"none",extraClasses:"",link:!1,linkUrl:"",linkClassName:"",linkTargetBlank:!1,linkRel:"",title:""},e.url=l.getAttrib(b,"src"),e.alt=l.getAttrib(b,"alt"),e.title=l.getAttrib(b,"title"),i=l.getAttrib(b,"width"),j=l.getAttrib(b,"height"),(!m.test(i)||parseInt(i,10)<1)&&(i=b.naturalWidth||b.width),(!m.test(j)||parseInt(j,10)<1)&&(j=b.naturalHeight||b.height),e.customWidth=e.width=i,e.customHeight=e.height=j,c=tinymce.explode(b.className," "),d=[],tinymce.each(c,function(a){/^wp-image/.test(a)?e.attachment_id=parseInt(a.replace("wp-image-",""),10):/^align/.test(a)?e.align=a.replace("align",""):/^size/.test(a)?e.size=a.replace("size-",""):d.push(a)}),e.extraClasses=d.join(" "),f=l.getParents(b,".wp-caption"),f.length&&(f=f[0],c=f.className.split(" "),tinymce.each(c,function(a){/^align/.test(a)?e.align=a.replace("align",""):a&&"wp-caption"!==a&&k.push(a)}),e.captionClassName=k.join(" "),g=l.select("dd.wp-caption-dd",f),g.length&&(g=g[0],e.caption=a.serializer.serialize(g).replace(/]*>/g,"$&\n").replace(/^

/,"").replace(/<\/p>$/,""))),b.parentNode&&"A"===b.parentNode.nodeName&&(h=b.parentNode,e.linkUrl=l.getAttrib(h,"href"),e.linkTargetBlank="_blank"===l.getAttrib(h,"target")?!0:!1,e.linkRel=l.getAttrib(h,"rel"),e.linkClassName=h.className),e}function h(a){return a&&!(!a.textContent&&!a.innerText)}function i(b){return!b||-1===b.indexOf("<")&&-1===b.indexOf(">")?b:(n||(n=new tinymce.html.Serializer({},a.schema)),n.serialize(a.parser.parse(b,{forced_root_block:!1})))}function j(b,c){var d,e,f,g,j,k,l,m,n,o,p,q,r,s,t,u,v=a.dom;d=tinymce.explode(c.extraClasses," "),d||(d=[]),c.caption||d.push("align"+c.align),c.attachment_id&&(d.push("wp-image-"+c.attachment_id),c.size&&"custom"!==c.size&&d.push("size-"+c.size)),s=c.width,t=c.height,"custom"===c.size&&(s=c.customWidth,t=c.customHeight),q={src:c.url,width:s||null,height:t||null,alt:c.alt,title:c.title||null,"class":d.join(" ")||null},v.setAttribs(b,q),r={href:c.linkUrl,rel:c.linkRel||null,target:c.linkTargetBlank?"_blank":null,"class":c.linkClassName||null},b.parentNode&&"A"===b.parentNode.nodeName&&!h(b.parentNode)?c.linkUrl?v.setAttribs(b.parentNode,r):v.remove(b.parentNode,!0):c.linkUrl&&((l=v.getParent(b,"a"))&&v.insertAfter(b,l),l=v.create("a",r),b.parentNode.insertBefore(l,b),l.appendChild(b)),m=a.dom.getParent(b,".mceTemp"),f=b.parentNode&&"A"===b.parentNode.nodeName&&!h(b.parentNode)?b.parentNode:b,c.caption?(c.caption=i(c.caption),p=c.attachment_id?"attachment_"+c.attachment_id:null,u="align"+(c.align||"none"),e="wp-caption "+u,c.captionClassName&&(e+=" "+c.captionClassName.replace(/[<>&]+/g,"")),a.getParam("wpeditimage_html5_captions")||(s=parseInt(s,10),s+=10),m?(o=v.select("dl.wp-caption",m),o.length&&v.setAttribs(o,{id:p,"class":e,style:"width: "+s+"px"}),n=v.select(".wp-caption-dd",m),n.length&&v.setHTML(n[0],c.caption)):(p=p?'id="'+p+'" ':"",g="

'+c.caption+"
",k=v.create("div",{"class":"mceTemp"},g),(j=v.getParent(f,"p"))?(j.parentNode.insertBefore(k,j),v.isEmpty(j)&&v.remove(j)):f.parentNode.insertBefore(k,f),a.$(k).find("dt.wp-caption-dt").append(f))):m&&(j=v.create("p"),m.parentNode.insertBefore(j,m),j.appendChild(f),v.remove(m)),wp.media.events&&wp.media.events.trigger("editor:image-update",{editor:a,metadata:c,image:b}),a.nodeChanged()}function k(b){var c,d,e;return"undefined"!=typeof wp&&wp.media?(e=g(b),wp.media.events.trigger("editor:image-edit",{editor:a,metadata:e,image:b}),c=wp.media({frame:"image",state:"image-details",metadata:e}),wp.media.events.trigger("editor:frame-create",{frame:c}),d=function(d){a.focus(),a.undoManager.transact(function(){j(b,d)}),c.detach()},c.state("image-details").on("update",d),c.state("replace-image").on("replace",d),c.on("close",function(){a.focus(),c.detach()}),void c.open()):void a.execCommand("mceImage")}function l(b){var c;"DIV"===b.nodeName&&a.dom.hasClass(b,"mceTemp")?c=b:("IMG"===b.nodeName||"DT"===b.nodeName||"A"===b.nodeName)&&(c=a.dom.getParent(b,"div.mceTemp")),c?(a.selection.select(c.nextSibling?c.nextSibling:c.previousSibling?c.previousSibling:c.parentNode),a.selection.collapse(!0),a.dom.remove(c)):a.dom.remove(b),a.nodeChanged(),a.undoManager.add()}var m,n,o=tinymce.DOM,p=a.settings,q=tinymce.ui.Factory,r=tinymce.each,s=tinymce.Env.iOS,t=!0,u=tinymce.$("#postdivrich");return a.addButton("wp_img_remove",{tooltip:"Remove",icon:"dashicon dashicons-no",onclick:function(){l(a.selection.getNode())}}),a.addButton("wp_img_edit",{tooltip:"Edit",icon:"dashicon dashicons-edit",onclick:function(){k(a.selection.getNode())}}),r({alignleft:"Align left",aligncenter:"Align center",alignright:"Align right",alignnone:"No alignment"},function(b,c){var d=c.slice(5);a.addButton("wp_img_"+c,{tooltip:b,icon:"dashicon dashicons-align-"+d,cmd:"alignnone"===c?"wpAlignNone":"Justify"+d.slice(0,1).toUpperCase()+d.slice(1),onPostRender:function(){var b=this;a.on("NodeChange",function(d){var e;"IMG"===d.element.nodeName&&(e=a.dom.getParent(d.element,".wp-caption")||d.element,b.active("alignnone"===c?!/\balign(left|center|right)\b/.test(e.className):a.dom.hasClass(e,c)))})}})}),m=q.create(c()).renderTo(document.body).hide(),m.reposition=function(){var b,c,d,e,f,g,h,i,j,k,l,m,n,p,q,r,t,u,v,w,x,y=this.getEl(),z=5,A=8,B=0,C=a.selection.getNode();return C&&"IMG"===C.nodeName?(f=window.pageYOffset||document.documentElement.scrollTop,g=tinymce.$("#wpadminbar")[0],h=tinymce.$(".mce-tinymce .mce-toolbar-grp")[0],i=C.getBoundingClientRect(),j=(i.left+i.right)/2,k=(i.top+i.bottom)/2,l=i.top,m=v-i.bottom,n=window.innerWidth,p=y.offsetWidth,q=p/2,r=a.getContentAreaContainer().firstChild,t=o.getPos(r),u=r.offsetWidth,v=r.offsetHeight,w=y.offsetHeight,x=w+A+z,s?b=i.top+t.y+A:l>=x?(e=" mce-arrow-down",b=i.top+t.y-w-A):m>=x?(e=" mce-arrow-up",b=i.bottom+t.y):(b=z,e=k>=x?" mce-arrow-down":" mce-arrow-up"),d=h?o.getPos(h).y+h.clientHeight:t.y,f&&(g&&0===g.getBoundingClientRect().top&&(B=g.clientHeight),f+B>d&&(d=f+B)),b&&d&&d+z>b&&(b=d+z,e=""),c=j-q,c+=t.x,p>=n?(e+=" mce-arrow-full",c=0):0>c&&i.left+p>n||c+p>n&&i.right-p<0?c=(n-p)/2:cu+t.x&&(e+=" mce-arrow-right",c=i.right-p+t.x),s||(y.className=y.className.replace(/ ?mce-arrow-[\w]+/g,""),y.className+=e),o.setStyles(y,{left:c,top:b}),this):this},s&&a.on("click",function(b){if("IMG"===b.target.nodeName){var c=b.target;window.setTimeout(function(){a.selection.select(c)},200)}else m.hide()}),a.on("nodechange",function(c){var d=s?350:100;return"IMG"!==c.element.nodeName||b(c.element)?void m.hide():void setTimeout(function(){var c=a.selection.getNode();"IMG"!==c.nodeName||b(c)?m.hide():m._visible?m.reposition():m.show()},d)}),m.on("show",function(){var a=this;t=!1,setTimeout(function(){a._visible&&(o.addClass(a.getEl(),"mce-inline-toolbar-grp-active"),a.reposition())},100)}),m.on("hide",function(){t=!0,o.removeClass(this.getEl(),"mce-inline-toolbar-grp-active")}),m.on("keydown",function(a){27===a.keyCode&&d()}),o.bind(window,"resize scroll",function(){!t&&u.hasClass("wp-editor-expand")&&d()}),a.on("init",function(){a.dom.bind(a.getWin(),"scroll",d)}),a.on("blur hide",d),a.shortcuts.add("Alt+119","",function(){var a=m.find("toolbar")[0];a&&a.focus(!0)}),a.on("init",function(){var b=a.dom,c=a.getParam("wpeditimage_html5_captions")?"html5-captions":"html4-captions";b.addClass(a.getBody(),c),a.on("wpLoadImageForm",function(b){if(!a.getParam("wpeditimage_disable_captions")){var c={type:"textbox",flex:1,name:"caption",minHeight:60,multiline:!0,scroll:!0,label:"Image caption"};b.data.splice(b.data.length-1,0,c)}}),a.on("wpNewImageRefresh",function(a){var c,d;(c=b.getParent(a.node,"dl.wp-caption"))&&(c.style.width||(d=parseInt(a.node.clientWidth,10)+10,d=d?d+"px":"50%",b.setStyle(c,"width",d)))}),a.on("wpImageFormSubmit",function(c){var d,e,f,g,h,j=c.imgData.data,k=c.imgData.node,l=c.imgData.caption,m="",n="",o="";return j.id="__wp-temp-img-id",c.imgData.cancel=!0,j.style||(j.style=null),j.src?(l&&(l=l.replace(/\r\n|\r/g,"\n").replace(/<\/?[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),l=l.replace(/(]*>)\s*\n\s*/g,"$1").replace(/\s*\n\s*/g,"
"),l=i(l)),k?(h=k.id||null,b.setAttribs(k,j),d=b.getParent(k,"dl.wp-caption"),l?d?(e=b.select("dd.wp-caption-dd",d)[0])&&(e.innerHTML=l):(k.className&&(m=k.className.match(/wp-image-([0-9]+)/),n=k.className.match(/align(left|right|center|none)/)),n?(n=n[0],k.className=k.className.replace(/align(left|right|center|none)/g,"")):n="alignnone",n=' class="wp-caption '+n+'"',m&&(m=' id="attachment_'+m[1]+'"'),o=j.width||k.clientWidth,o&&(o=parseInt(o,10),a.getParam("wpeditimage_html5_captions")||(o+=10),o=' style="width: '+o+'px"'),f=k.parentNode&&"A"===k.parentNode.nodeName?k.parentNode:k,g="
'+l+"
",d=b.create("div",{"class":"mceTemp"},g),(e=b.getParent(f,"p"))?(e.parentNode.insertBefore(d,e),b.isEmpty(e)&&b.remove(e)):f.parentNode.insertBefore(d,f),a.$(d).find("dt.wp-caption-dt").append(f)):d&&(g=b.getOuterHTML("A"===k.parentNode.nodeName?k.parentNode:k),e=b.create("p",{},g),b.insertAfter(e,d.parentNode),a.selection.select(e),a.nodeChanged(),b.remove(d.parentNode))):(g=b.createHTML("img",j),l?(f=a.selection.getNode(),j.width&&(o=parseInt(j.width,10),a.getParam("wpeditimage_html5_captions")||(o+=10),o=' style="width: '+o+'px"'),g='
'+g+'
'+l+"
",e="P"===f.nodeName?f:b.getParent(f,"p"),e&&"P"===e.nodeName?(d=b.create("div",{"class":"mceTemp"},g),e.parentNode.insertBefore(d,e),a.selection.select(d),a.nodeChanged(),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('
'+g+"
")):a.selection.setContent(g)),k=b.get("__wp-temp-img-id"),b.setAttrib(k,"id",h),void(c.imgData.node=k)):void(k&&(b.remove((d=b.getParent(k,"div.mceTemp"))?d:"A"===k.parentNode.nodeName?k.parentNode:k),a.nodeChanged()))}),a.on("wpLoadImageData",function(c){var d,e=c.imgData.data,f=c.imgData.node;(d=b.getParent(f,"dl.wp-caption"))&&(d=b.select("dd.wp-caption-dd",d)[0],d&&(e.caption=a.serializer.serialize(d).replace(/]*>/g,"$&\n").replace(/^

/,"").replace(/<\/p>$/,"")))}),b.bind(a.getDoc(),"dragstart",function(c){var d=a.selection.getNode();"IMG"===d.nodeName&&b.getParent(d,".wp-caption")&&c.preventDefault()}),tinymce.Env.ie&&tinymce.Env.ie>10&&b.bind(a.getBody(),"mscontrolselect",function(c){"IMG"===c.target.nodeName&&b.getParent(c.target,".wp-caption")?a.getBody().focus():"DL"===c.target.nodeName&&b.hasClass(c.target,"wp-caption")&&c.target.focus()})}),a.on("ObjectResized",function(b){var c=b.target;"IMG"===c.nodeName&&a.undoManager.transact(function(){var d,e,f=a.dom;c.className=c.className.replace(/\bsize-[^ ]+/,""),(d=f.getParent(c,".wp-caption"))&&(e=b.width||f.getAttrib(c,"width"),e&&(e=parseInt(e,10),a.getParam("wpeditimage_html5_captions")||(e+=10),f.setStyle(d,"width",e+"px")))})}),a.on("BeforeExecCommand",function(b){var c,d,e,f,g,h=b.command,i=a.dom;if("mceInsertContent"===h)(c=i.getParent(a.selection.getNode(),"div.mceTemp"))&&(d=i.create("p"),i.insertAfter(d,c),a.selection.setCursorLocation(d,0),a.nodeChanged());else if("JustifyLeft"===h||"JustifyRight"===h||"JustifyCenter"===h||"wpAlignNone"===h){if(c=a.selection.getNode(),f="align"+h.slice(7).toLowerCase(),e=a.dom.getParent(c,".wp-caption"),"IMG"!==c.nodeName&&!e)return;c=e||c,g=a.dom.hasClass(c,f)?" alignnone":" "+f,c.className=c.className.replace(/ ?align(left|center|right|none)/g,"")+g,a.nodeChanged(),b.preventDefault(),m&&m.reposition(),a.fire("ExecCommand",{command:h,ui:b.ui,value:b.value})}}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,h=b.keyCode,i=a.dom,j=tinymce.util.VK;if(h===j.ENTER)c=g.getNode(),d=i.getParent(c,"div.mceTemp"),d&&(i.events.cancel(b),tinymce.each(i.select("dt, dd",d),function(a){i.isEmpty(a)&&i.remove(a)}),f=tinymce.Env.ie&&tinymce.Env.ie<11?"":'
',e=i.create("p",null,f),"DD"===c.nodeName?i.insertAfter(e,d):d.parentNode.insertBefore(e,d),a.nodeChanged(),g.setCursorLocation(e,0));else if((h===j.DELETE||h===j.BACKSPACE)&&(c=g.getNode(),"DIV"===c.nodeName&&i.hasClass(c,"mceTemp")?d=c:("IMG"===c.nodeName||"DT"===c.nodeName||"A"===c.nodeName)&&(d=i.getParent(c,"div.mceTemp")),d))return i.events.cancel(b),l(c),!1}),tinymce.Env.gecko&&a.on("undo redo",function(){"IMG"===a.selection.getNode().nodeName&&a.selection.collapse()}),a.wpSetImgCaption=function(a){return e(a)},a.wpGetImgCaption=function(a){return f(a)},a.on("BeforeSetContent",function(b){"raw"!==b.format&&(b.content=a.wpSetImgCaption(b.content))}),a.on("PostProcess",function(b){b.get&&(b.content=a.wpGetImgCaption(b.content))}),{_do_shcode:e,_get_shcode:f}}); \ No newline at end of file diff --git a/wp-includes/js/tinymce/wp-mce-help.php b/wp-includes/js/tinymce/wp-mce-help.php index ea89a7bc6b..219f6ca7fb 100644 --- a/wp-includes/js/tinymce/wp-mce-help.php +++ b/wp-includes/js/tinymce/wp-mce-help.php @@ -103,8 +103,7 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset')); u1 23 45 - 69 - k   + 6k

@@ -120,6 +119,17 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset')); ph x   + +

+ + + + + + +
Alt + F8
Alt + F9
Alt + F10
Alt + F11
+ +

diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index 399e86e38367eec69940f6c44ccf725853871f3e..d7dfd9eacd3859614bc93b04d45fd1bf349c27db 100644 GIT binary patch delta 10663 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 O|NjSx-ZzVjJq7?cU9_SA diff --git a/wp-includes/version.php b/wp-includes/version.php index 024a7fe343..18581bf57c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30756'; +$wp_version = '4.1-beta2-30757'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.