<!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>[27582] trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js: wpView:</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/27582">27582</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-03-18 04:56:27 +0000 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>wpView:
- Makes sure that the editor is focused when clicking on a wpview.
- When a view is the first or last node in the editor and a click on the area around the view adds a new paragraph, deselect the wpview so that the new paragraph is properly focused.
- When navigating via keyboard, select or deselect wpviews as appropriate.
Props gcorne, see <a href="http://core.trac.wordpress.org/ticket/26959">#26959</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswpviewpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjstinymcepluginswpviewpluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js (27581 => 27582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-03-18 03:47:59 UTC (rev 27581)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-03-18 04:56:27 UTC (rev 27582)
</span><span class="lines">@@ -86,6 +86,11 @@
</span><span class="cx"> editor.dom.bind( clipboard, 'beforedeactivate focusin focusout', _stop );
</span><span class="cx"> editor.dom.bind( selected, 'beforedeactivate focusin focusout', _stop );
</span><span class="cx">
</span><ins>+ // Make sure that the editor is focused.
+ // It is possible that the editor is not focused when the mouse event fires
+ // without focus, the selection will not work properly.
+ editor.getBody().focus();
+
</ins><span class="cx"> // select the hidden div
</span><span class="cx"> editor.selection.select( clipboard, true );
</span><span class="cx"> }
</span><span class="lines">@@ -156,8 +161,6 @@
</span><span class="cx"> editor.selection.setCursorLocation( padNode, 0 );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- // refreshEmptyContentNode();
</del><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Detect mouse down events that are adjacent to a view when a view is the first view or the last view
</span><span class="lines">@@ -188,6 +191,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( padNode ) {
</span><ins>+ // Make sure that a selected view is deselected so that focus and selection are handled properly
+ deselect();
+ editor.getBody().focus();
</ins><span class="cx"> editor.selection.setCursorLocation( padNode, 0 );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -298,7 +304,8 @@
</span><span class="cx">
</span><span class="cx"> editor.on( 'keydown', function( event ) {
</span><span class="cx"> var keyCode = event.keyCode,
</span><del>- view;
</del><ins>+ body = editor.getBody(),
+ view, padNode;
</ins><span class="cx">
</span><span class="cx"> // If a view isn't selected, let the event go on its merry way.
</span><span class="cx"> if ( ! selected ) {
</span><span class="lines">@@ -314,23 +321,81 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ view = getParentView( editor.selection.getNode() );
+
</ins><span class="cx"> // If the caret is not within the selected view, deselect the
</span><span class="cx"> // view and bail.
</span><del>- view = getParentView( editor.selection.getNode() );
-
</del><span class="cx"> if ( view !== selected ) {
</span><span class="cx"> deselect();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If delete or backspace is pressed, delete the view.
- if ( keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
</del><ins>+ if ( keyCode === VK.LEFT || keyCode === VK.UP ) {
+ deselect();
+ // Handle case where two views are stacked on top of one another
+ if ( isView( view.previousSibling ) ) {
+ select( view.previousSibling );
+ // Handle case where view is the first node
+ } else if ( view.previousSibling === null ) {
+ padNode = createPadNode();
+ body.insertBefore( padNode, body.firstChild );
+ editor.selection.setCursorLocation( body.firstChild, 0 );
+ // Handle default case
+ } else {
+ editor.selection.select( view.previousSibling, true );
+ editor.selection.collapse();
+ }
+ } else if ( keyCode === VK.RIGHT || keyCode === VK.DOWN ) {
+ deselect();
+ // Handle case where the next node is another wpview
+ if ( isView( view.nextSibling ) ) {
+ select( view.nextSibling );
+ // Handle case were the view is that last node
+ } else if ( view.nextSibling === null ) {
+ padNode = createPadNode();
+ body.appendChild( padNode );
+ editor.selection.setCursorLocation( body.lastChild, 0 );
+ // Handle default case where the next node is a non-wpview
+ } else {
+ editor.selection.setCursorLocation( view.nextSibling.firstChild, 0 );
+ }
+ } else if ( keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
+ // If delete or backspace is pressed, delete the view.
</ins><span class="cx"> editor.dom.remove( selected );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ // Select and deselect views when arrow keys are used to navigate the content of the editor.
+ editor.on( 'keydown', function( event ) {
+ var keyCode = event.keyCode,
+ range = editor.selection.getRng(),
+ body = editor.getBody(),
+ node;
+
+ if ( ! range.collapsed || event.metaKey || event.ctrlKey ) {
+ return;
+ }
+
+ if ( keyCode === VK.LEFT || keyCode === VK.UP ) {
+ node = range.startContainer.parentNode === body ? range.startContainer : range.startContainer.parentNode;
+ // The caret is directly after a wpview
+ if ( range.startOffset === 0 && isView( node.previousSibling ) ) {
+ select( node.previousSibling );
+ event.preventDefault();
+ }
+ } else if ( keyCode === VK.RIGHT || keyCode === VK.DOWN ) {
+ node = range.startContainer.parentNode === body ? range.startContainer : range.startContainer.parentNode;
+ // The caret is directly before a wpview
+ if ( ( ( range.startOffset === 0 && ! range.endContainer.length ) || ( range.startOffset === range.endContainer.length ) ) &&
+ isView( node.nextSibling ) ) {
+ select( node.nextSibling );
+ event.preventDefault();
+ }
+ }
+ });
+
</ins><span class="cx"> editor.on( 'keyup', function( event ) {
</span><span class="cx"> var padNode,
</span><span class="cx"> keyCode = event.keyCode,
</span></span></pre>
</div>
</div>
</body>
</html>