<!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>[30257] branches/4.0: TinyMCE wpView: when pasting/inserting content before a view, add new paragraph above it and insert the content there.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30257">30257</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30257","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>nacin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-06 08:12:25 +0000 (Thu, 06 Nov 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>TinyMCE wpView: when pasting/inserting content before a view, add new paragraph above it and insert the content there.
Merges <a href="https://core.trac.wordpress.org/changeset/29766">[29766]</a> to the 4.0 branch.
props avryl.
fixes <a href="https://core.trac.wordpress.org/ticket/29380">#29380</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches40srcwpincludesjstinymcepluginswpviewpluginjs">branches/4.0/src/wp-includes/js/tinymce/plugins/wpview/plugin.js</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches40">branches/4.0/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.0
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.0 2014-11-06 08:11:03 UTC (rev 30256)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.0 2014-11-06 08:12:25 UTC (rev 30257)
</ins><a id="branches40"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.0</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,29725,29733,29738,29751,29829,29884,29886,30090,30242
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,29725,29733,29738,29751,29766,29829,29884,29886,30090,30242
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches40srcwpincludesjstinymcepluginswpviewpluginjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/src/wp-includes/js/tinymce/plugins/wpview/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-11-06 08:11:03 UTC (rev 30256)
+++ branches/4.0/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-11-06 08:12:25 UTC (rev 30257)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> firstFocus = true,
</span><span class="cx" style="display: block; padding: 0 10px"> _noop = function() { return false; },
</span><span class="cx" style="display: block; padding: 0 10px"> isios = /iPad|iPod|iPhone/.test( navigator.userAgent ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cursorInterval, lastKeyDownNode, setViewCursorTries, focus, execCommandView;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cursorInterval, lastKeyDownNode, setViewCursorTries, focus, execCommandView, execCommandBefore;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function getView( node ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return getParent( node, 'wpview-wrap' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,7 +368,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Ref: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.keyCode
</span><span class="cx" style="display: block; padding: 0 10px"> function isSpecialKey( key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return ( ( key <= 47 && key !== VK.SPACEBAR && key !== VK.ENTER && key !== VK.DELETE && key !== VK.BACKSPACE && ( key < 37 || key > 40 ) ) ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- key >= 224 || // OEM or non-printable
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ key >= 224 || // OEM or non-printable
</ins><span class="cx" style="display: block; padding: 0 10px"> ( key >= 144 && key <= 150 ) || // Num Lock, Scroll Lock, OEM
</span><span class="cx" style="display: block; padding: 0 10px"> ( key >= 91 && key <= 93 ) || // Windows keys
</span><span class="cx" style="display: block; padding: 0 10px"> ( key >= 112 && key <= 135 ) ); // F keys
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -649,8 +649,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var node = editor.selection.getNode(),
</span><span class="cx" style="display: block; padding: 0 10px"> view;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( node && ( node.className === 'wpview-selection-before' || node.className === 'wpview-selection-after' ) && ( view = getView( node ) ) ) {
- handleEnter( view );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( node && ( ( execCommandBefore = node.className === 'wpview-selection-before' ) || node.className === 'wpview-selection-after' ) && ( view = getView( node ) ) ) {
+ handleEnter( view, execCommandBefore );
</ins><span class="cx" style="display: block; padding: 0 10px"> execCommandView = view;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -665,11 +665,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( execCommandView ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- node = execCommandView.nextSibling;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ node = execCommandView[ execCommandBefore ? 'previousSibling' : 'nextSibling' ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( node && node.nodeName === 'P' && editor.dom.isEmpty( node ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> editor.dom.remove( node );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setViewCursor( false, execCommandView );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setViewCursor( execCommandBefore, execCommandView );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> execCommandView = false;
</span></span></pre>
</div>
</div>
</body>
</html>