<!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>[21254] trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js: TinyMCE: when pressing Enter while an image with caption is selected, fix moving the caret in a new paragraph under it, fix opening the Image Properties popup in IE9, see #21173</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, #logmsg > ol { margin-left: 0; 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/21254">21254</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2012-07-10 02:31:30 +0000 (Tue, 10 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE: when pressing Enter while an image with caption is selected, fix moving the caret in a new paragraph under it, fix opening the Image Properties popup in IE9, see <a href="http://core.trac.wordpress.org/ticket/21173">#21173</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcepluginswpeditimageeditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcepluginswpeditimageeditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js (21253 => 21254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js 2012-07-09 21:10:59 UTC (rev 21253)
+++ trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js 2012-07-10 02:31:30 UTC (rev 21254)
</span><span class="lines">@@ -11,25 +11,8 @@
</span><span class="cx"> t.editor = ed;
</span><span class="cx"> t._createButtons();
</span><span class="cx">
</span><del>- // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...');
- ed.addCommand('WP_EditImage', function() {
- var el = ed.selection.getNode(), vp, H, W, cls = ed.dom.getAttrib(el, 'class');
</del><ins>+ ed.addCommand('WP_EditImage', t._editImage);
</ins><span class="cx">
</span><del>- if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 || el.nodeName != 'IMG' )
- return;
-
- vp = tinymce.DOM.getViewPort();
- H = 680 < (vp.h - 70) ? 680 : vp.h - 70;
- W = 650 < vp.w ? 650 : vp.w;
-
- ed.windowManager.open({
- file: url + '/editimage.html',
- width: W+'px',
- height: H+'px',
- inline: true
- });
- });
-
</del><span class="cx"> ed.onInit.add(function(ed) {
</span><span class="cx"> ed.dom.events.add(ed.getBody(), 'dragstart', function(e) {
</span><span class="cx"> var parent;
</span><span class="lines">@@ -38,6 +21,27 @@
</span><span class="cx"> ed.selection.select(parent);
</span><span class="cx"> }
</span><span class="cx"> });
</span><ins>+
+ // when pressing Return inside a caption move the caret to a new parapraph under it
+ ed.dom.events.add(ed.getBody(), 'keydown', function(e) {
+ var n, DL, DIV, P, content;
+
+ if ( e.keyCode == 13 ) {
+ n = ed.selection.getNode();
+ DL = ed.dom.getParent(n, 'dl.wp-caption');
+
+ if ( DL )
+ DIV = ed.dom.getParent(DL, 'div.mceTemp');
+
+ if ( DIV ) {
+ ed.dom.events.cancel(e);
+ P = ed.dom.create('p', {}, '\uFEFF');
+ ed.dom.insertAfter( P, DIV );
+ ed.selection.setCursorLocation(P, 0);
+ return false;
+ }
+ }
+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // resize the caption <dl> when the image is soft-resized by the user (only possible in Firefox and IE)
</span><span class="lines">@@ -90,35 +94,6 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // when pressing Return inside a caption move the caret to a new parapraph under it
- ed.onKeyPress.add(function(ed, e) {
- var n, DL, DIV, P;
-
- if ( e.keyCode == 13 ) {
- n = ed.selection.getNode();
- DL = ed.dom.getParent(n, 'dl.wp-caption');
-
- if ( DL )
- DIV = ed.dom.getParent(DL, 'div.mceTemp');
-
- if ( DIV ) {
- P = ed.dom.create('p', {}, '<br>');
- ed.dom.insertAfter( P, DIV );
- ed.selection.select(P.firstChild);
-
- if ( tinymce.isIE ) {
- ed.selection.setContent('');
- } else {
- ed.selection.setContent('<br _moz_dirty="">');
- ed.selection.setCursorLocation(P, 0);
- }
-
- ed.dom.events.cancel(e);
- return false;
- }
- }
- });
-
</del><span class="cx"> ed.onBeforeSetContent.add(function(ed, o) {
</span><span class="cx"> o.content = ed.wpSetImgCaption(o.content);
</span><span class="cx"> });
</span><span class="lines">@@ -239,9 +214,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> tinymce.dom.Event.add(editButton, 'mousedown', function(e) {
</span><del>- var ed = tinyMCE.activeEditor;
- ed.windowManager.bookmark = ed.selection.getBookmark('simple');
- ed.execCommand("WP_EditImage");
</del><ins>+ t._editImage();
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> dellButton = DOM.add('wp_editbtns', 'img', {
</span><span class="lines">@@ -268,7 +241,25 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> },
</span><ins>+
+ _editImage : function() {
+ var ed = this.editor, url = this.url, el = ed.selection.getNode(), vp, H, W, cls = el.className;
</ins><span class="cx">
</span><ins>+ if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 || el.nodeName != 'IMG' )
+ return;
+
+ vp = tinymce.DOM.getViewPort();
+ H = 680 < (vp.h - 70) ? 680 : vp.h - 70;
+ W = 650 < vp.w ? 650 : vp.w;
+
+ ed.windowManager.open({
+ file: url + '/editimage.html',
+ width: W+'px',
+ height: H+'px',
+ inline: true
+ });
+ },
+
</ins><span class="cx"> getInfo : function() {
</span><span class="cx"> return {
</span><span class="cx"> longname : 'Edit Image',
</span></span></pre>
</div>
</div>
</body>
</html>