<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27786] trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js: Remove the TinyMCE image toolbar when the image is deleted via the keyboard.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27786">27786</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-27 18:06:13 +0000 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the TinyMCE image toolbar when the image is deleted via the keyboard.
props gcorne.
fixes <a href="http://core.trac.wordpress.org/ticket/27527">#27527</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimagepluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjstinymcepluginswpeditimagepluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (27785 => 27786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-03-27 17:57:30 UTC (rev 27785)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-03-27 18:06:13 UTC (rev 27786)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> /* global tinymce */
</span><span class="cx"> tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
</span><ins>+ var toolbarActive = false;
+
</ins><span class="cx"> function parseShortcode( content ) {
</span><span class="cx"> return content.replace( /(?:<p>)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g, function( a, b, c ) {
</span><span class="cx"> var id, cls, w, cap, img, width,
</span><span class="lines">@@ -102,7 +104,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> if ( out.indexOf('[caption') !== 0 ) {
</span><del>- // the caption html seems brocken, try to find the image that may be wrapped in a link
</del><ins>+ // the caption html seems broken, try to find the image that may be wrapped in a link
</ins><span class="cx"> // and may be followed by <p> with the caption text.
</span><span class="cx"> out = b.replace( /[\s\S]*?((?:<a [^>]+>)?<img [^>]+>(?:<\/a>)?)(<p>[\s\S]*<\/p>)?[\s\S]*/gi, '<p>$1</p>$2' );
</span><span class="cx"> }
</span><span class="lines">@@ -339,6 +341,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> editor.dom.remove( node );
</span><span class="cx"> }
</span><ins>+ removeToolbar();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function addToolbar( node ) {
</span><span class="lines">@@ -371,6 +374,8 @@
</span><span class="cx"> top: rectangle.y,
</span><span class="cx"> left: rectangle.x
</span><span class="cx"> });
</span><ins>+
+ toolbarActive = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function removeToolbar() {
</span><span class="lines">@@ -381,6 +386,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> editor.dom.setAttrib( editor.dom.select( 'img[data-wp-imgselect]' ), 'data-wp-imgselect', null );
</span><ins>+
+ toolbarActive = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function isPlaceholder( node ) {
</span><span class="lines">@@ -753,9 +760,10 @@
</span><span class="cx"> editor.on( 'keydown', function( event ) {
</span><span class="cx"> var node, wrap, P, spacer,
</span><span class="cx"> selection = editor.selection,
</span><ins>+ keyCode = event.keyCode,
</ins><span class="cx"> dom = editor.dom;
</span><span class="cx">
</span><del>- if ( event.keyCode === tinymce.util.VK.ENTER ) {
</del><ins>+ if ( keyCode === tinymce.util.VK.ENTER ) {
</ins><span class="cx"> // When pressing Enter inside a caption move the caret to a new parapraph under it
</span><span class="cx"> node = selection.getNode();
</span><span class="cx"> wrap = dom.getParent( node, 'div.mceTemp' );
</span><span class="lines">@@ -782,7 +790,7 @@
</span><span class="cx"> editor.nodeChanged();
</span><span class="cx"> selection.setCursorLocation( P, 0 );
</span><span class="cx"> }
</span><del>- } else if ( event.keyCode === tinymce.util.VK.DELETE || event.keyCode === tinymce.util.VK.BACKSPACE ) {
</del><ins>+ } else if ( keyCode === tinymce.util.VK.DELETE || keyCode === tinymce.util.VK.BACKSPACE ) {
</ins><span class="cx"> node = selection.getNode();
</span><span class="cx">
</span><span class="cx"> if ( node.nodeName === 'DIV' && dom.hasClass( node, 'mceTemp' ) ) {
</span><span class="lines">@@ -796,7 +804,19 @@
</span><span class="cx"> removeImage( node );
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
+ removeToolbar();
</ins><span class="cx"> }
</span><ins>+
+ // Key presses will replace the image so we need to remove the toolbar
+ if ( toolbarActive ) {
+ if ( event.ctrlKey || event.metaKey || event.altKey ||
+ ( keyCode < 48 && keyCode > 90 ) || keyCode > 186 ) {
+ return;
+ }
+
+ removeToolbar();
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> editor.on( 'mousedown', function( event ) {
</span><span class="lines">@@ -828,7 +848,6 @@
</span><span class="cx">
</span><span class="cx"> if ( dom.hasClass( node, 'remove' ) ) {
</span><span class="cx"> removeImage( image );
</span><del>- removeToolbar();
</del><span class="cx"> } else if ( dom.hasClass( node, 'edit' ) ) {
</span><span class="cx"> editImage( image );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>