<!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>[29236] trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js: TinyMCE 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/29236">29236</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-07-19 00:33:46 +0000 (Sat, 19 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE wpView:
- Typing something replaces a selected view.
- Pressing backspace deletes the selection.
- Pressing enter also deletes the selection.
- Pasting something replaces the selection.
- Also merge the different 'keydown' handlers.
Props avryl, fixes <a href="http://core.trac.wordpress.org/ticket/28913">#28913</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 (29235 => 29236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-07-19 00:25:46 UTC (rev 29235)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-07-19 00:33:46 UTC (rev 29236)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> editor.nodeChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function handleEnter( view, before, keyCode ) {
</del><ins>+ function handleEnter( view, before, key ) {
</ins><span class="cx"> var dom = editor.dom,
</span><span class="cx"> padNode = dom.create( 'p' );
</span><span class="cx">
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> deselect();
</span><span class="cx">
</span><del>- if ( before && keyCode === VK.ENTER ) {
</del><ins>+ if ( before && key === VK.ENTER ) {
</ins><span class="cx"> setViewCursor( before, view );
</span><span class="cx"> } else {
</span><span class="cx"> editor.selection.setCursorLocation( padNode, 0 );
</span><span class="lines">@@ -336,209 +336,199 @@
</span><span class="cx">
</span><span class="cx"> // (De)select views when arrow keys are used to navigate the content of the editor.
</span><span class="cx"> editor.on( 'keydown', function( event ) {
</span><del>- if ( event.metaKey || event.ctrlKey || ( keyCode >= 112 && keyCode <= 123 ) ) {
- return;
- }
-
- if ( selected ) {
- return;
- }
-
- var keyCode = event.keyCode,
</del><ins>+ var key = event.keyCode,
</ins><span class="cx"> dom = editor.dom,
</span><span class="cx"> selection = editor.selection,
</span><del>- node = selection.getNode(),
- view = getView( node ),
- cursorBefore, cursorAfter,
- range, clonedRange, tempRange;
</del><ins>+ node, view, cursorBefore, cursorAfter,
+ range, clonedRange, tempRange, remove;
</ins><span class="cx">
</span><del>- lastKeyDownNode = node;
</del><ins>+ if ( selected ) {
+ // Let key presses that involve the command or control keys through.
+ // Also, let any of the F# keys through.
+ if ( event.metaKey || event.ctrlKey || ( key >= 112 && key <= 123 ) ) {
+ // But remove the view when cmd/ctrl + x/backspace are pressed.
+ if ( ( event.metaKey || event.ctrlKey ) && ( key === 88 || key === VK.BACKSPACE ) ) {
+ // We'll remove a cut view on keyup, otherwise the browser can't copy the content.
+ if ( key === 88 ) {
+ toRemove = selected;
+ } else {
+ editor.dom.remove( selected );
+ }
+ }
+ return;
+ }
</ins><span class="cx">
</span><del>- // Make sure we don't delete part of a view.
- // If the range ends or starts with the view, we'll need to trim it.
- if ( ! selection.isCollapsed() ) {
- range = selection.getRng();
</del><ins>+ view = getView( selection.getNode() );
</ins><span class="cx">
</span><del>- if ( view = getView( range.endContainer ) ) {
- clonedRange = range.cloneRange();
- selection.select( view.previousSibling, true );
- selection.collapse();
- tempRange = selection.getRng();
- clonedRange.setEnd( tempRange.endContainer, tempRange.endOffset );
- selection.setRng( clonedRange );
- } else if ( view = getView( range.startContainer ) ) {
- clonedRange = range.cloneRange();
- clonedRange.setStart( view.nextSibling, 0 );
- selection.setRng( clonedRange );
</del><ins>+ // If the caret is not within the selected view, deselect the view and bail.
+ if ( view !== selected ) {
+ deselect();
+ return;
</ins><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- if ( ! view ) {
- return;
- }
-
- if ( ! ( ( cursorBefore = dom.hasClass( view, 'wpview-selection-before' ) ) ||
- ( cursorAfter = dom.hasClass( view, 'wpview-selection-after' ) ) ) ) {
- return;
- }
-
- if ( ( cursorAfter && keyCode === VK.UP ) || ( cursorBefore && keyCode === VK.BACKSPACE ) ) {
- if ( view.previousSibling ) {
- if ( getView( view.previousSibling ) ) {
- setViewCursor( false, view.previousSibling );
- } else {
- if ( dom.isEmpty( view.previousSibling ) && keyCode === VK.BACKSPACE ) {
- dom.remove( view.previousSibling );
</del><ins>+ if ( key === VK.LEFT ) {
+ setViewCursor( true, view );
+ event.preventDefault();
+ } else if ( key === VK.UP ) {
+ if ( view.previousSibling ) {
+ if ( getView( view.previousSibling ) ) {
+ setViewCursor( true, view.previousSibling );
</ins><span class="cx"> } else {
</span><ins>+ deselect();
</ins><span class="cx"> selection.select( view.previousSibling, true );
</span><span class="cx"> selection.collapse();
</span><span class="cx"> }
</span><del>- }
- } else {
- setViewCursor( true, view );
- }
- event.preventDefault();
- } else if ( cursorAfter && ( keyCode === VK.DOWN || keyCode === VK.RIGHT ) ) {
- if ( view.nextSibling ) {
- if ( getView( view.nextSibling ) ) {
- setViewCursor( keyCode === VK.RIGHT, view.nextSibling );
</del><span class="cx"> } else {
</span><del>- selection.setCursorLocation( view.nextSibling, 0 );
</del><ins>+ setViewCursor( true, view );
</ins><span class="cx"> }
</span><del>- }
- event.preventDefault();
- } else if ( cursorBefore && ( keyCode === VK.UP || keyCode === VK.LEFT ) ) {
- if ( view.previousSibling ) {
- if ( getView( view.previousSibling ) ) {
- setViewCursor( keyCode === VK.UP, view.previousSibling );
</del><ins>+ event.preventDefault();
+ } else if ( key === VK.RIGHT ) {
+ setViewCursor( false, view );
+ event.preventDefault();
+ } else if ( key === VK.DOWN ) {
+ if ( view.nextSibling ) {
+ if ( getView( view.nextSibling ) ) {
+ setViewCursor( false, view.nextSibling );
+ } else {
+ deselect();
+ selection.setCursorLocation( view.nextSibling, 0 );
+ }
</ins><span class="cx"> } else {
</span><del>- selection.select( view.previousSibling, true );
- selection.collapse();
</del><ins>+ setViewCursor( false, view );
</ins><span class="cx"> }
</span><del>- }
- event.preventDefault();
- } else if ( cursorBefore && keyCode === VK.DOWN ) {
- if ( view.nextSibling ) {
- if ( getView( view.nextSibling ) ) {
- setViewCursor( true, view.nextSibling );
- } else {
- selection.setCursorLocation( view.nextSibling, 0 );
- }
- } else {
- setViewCursor( false, view );
- }
- event.preventDefault();
- } else if ( ( cursorAfter && keyCode === VK.LEFT ) || ( cursorBefore && keyCode === VK.RIGHT ) ) {
- select( view );
- event.preventDefault();
- event.stopImmediatePropagation();
- } else if ( cursorAfter && keyCode === VK.BACKSPACE ) {
- dom.remove( view );
- event.preventDefault();
- } else if ( cursorAfter ) {
- handleEnter( view );
- } else if ( cursorBefore ) {
- handleEnter( view , true, keyCode );
- }
</del><ins>+ event.preventDefault();
+ // Ignore keys that don't insert anything.
+ } else if ( ( key > 47 || VK.SPACEBAR || key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE ) && key !== 144 && key !== 145 ) {
+ editor.undoManager.transact( function() {
+ remove = selected;
+ handleEnter( selected );
+ dom.remove( remove );
+ });
</ins><span class="cx">
</span><del>- if ( keyCode === VK.ENTER ) {
- event.preventDefault();
- }
- });
-
- // Handle key presses for selected views.
- editor.on( 'keydown', function( event ) {
- var dom = editor.dom,
- keyCode = event.keyCode,
- selection = editor.selection,
- view;
-
- // If a view isn't selected, let the event go on its merry way.
- if ( ! selected ) {
- return;
- }
-
- // Let key presses that involve the command or control keys through.
- // Also, let any of the F# keys through.
- if ( event.metaKey || event.ctrlKey || ( keyCode >= 112 && keyCode <= 123 ) ) {
- // But remove the view when cmd/ctrl + x/backspace are pressed.
- if ( ( event.metaKey || event.ctrlKey ) && ( keyCode === 88 || keyCode === VK.BACKSPACE ) ) {
- // We'll remove a cut view on keyup, otherwise the browser can't copy the content.
- if ( keyCode === 88 ) {
- toRemove = selected;
- } else {
- editor.dom.remove( selected );
</del><ins>+ if ( key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE ) {
+ event.preventDefault();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- return;
- }
</del><ins>+ } else {
+ if ( event.metaKey || event.ctrlKey || ( key >= 112 && key <= 123 ) ) {
+ return;
+ }
</ins><span class="cx">
</span><del>- view = getView( selection.getNode() );
</del><ins>+ node = selection.getNode();
+ lastKeyDownNode = node;
+ view = getView( node );
</ins><span class="cx">
</span><del>- // If the caret is not within the selected view, deselect the view and bail.
- if ( view !== selected ) {
- deselect();
- return;
- }
</del><ins>+ // Make sure we don't delete part of a view.
+ // If the range ends or starts with the view, we'll need to trim it.
+ if ( ! selection.isCollapsed() ) {
+ range = selection.getRng();
</ins><span class="cx">
</span><del>- if ( keyCode === VK.LEFT ) {
- setViewCursor( true, view );
- } else if ( keyCode === VK.UP ) {
- if ( view.previousSibling ) {
- if ( getView( view.previousSibling ) ) {
- setViewCursor( true, view.previousSibling );
- } else {
- deselect();
</del><ins>+ if ( view = getView( range.endContainer ) ) {
+ clonedRange = range.cloneRange();
</ins><span class="cx"> selection.select( view.previousSibling, true );
</span><span class="cx"> selection.collapse();
</span><ins>+ tempRange = selection.getRng();
+ clonedRange.setEnd( tempRange.endContainer, tempRange.endOffset );
+ selection.setRng( clonedRange );
+ } else if ( view = getView( range.startContainer ) ) {
+ clonedRange = range.cloneRange();
+ clonedRange.setStart( view.nextSibling, 0 );
+ selection.setRng( clonedRange );
</ins><span class="cx"> }
</span><del>- } else {
- setViewCursor( true, view );
</del><span class="cx"> }
</span><span class="cx">
</span><del>- } else if ( keyCode === VK.RIGHT ) {
- setViewCursor( false, view );
- } else if ( keyCode === VK.DOWN ) {
- if ( view.nextSibling ) {
- if ( getView( view.nextSibling ) ) {
- setViewCursor( false, view.nextSibling );
- } else {
- deselect();
- selection.setCursorLocation( view.nextSibling, 0 );
</del><ins>+ // Make sure we don't eat any content.
+ if ( event.keyCode === VK.BACKSPACE ) {
+ if ( editor.dom.isEmpty( node ) ) {
+ if ( view = getView( node.previousSibling ) ) {
+ setViewCursor( false, view );
+ editor.dom.remove( node );
+ event.preventDefault();
+ return;
+ }
+ } else if ( ( range = selection.getRng() ) &&
+ range.startOffset === 0 &&
+ range.endOffset === 0 &&
+ ( view = getView( node.previousSibling ) ) ) {
+ setViewCursor( false, view );
+ event.preventDefault();
+ return;
</ins><span class="cx"> }
</span><del>- } else {
- setViewCursor( false, view );
</del><span class="cx"> }
</span><del>- } else if ( keyCode === VK.ENTER ) {
- handleEnter( view );
- } else if ( keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
- dom.remove( selected );
- }
</del><span class="cx">
</span><del>- event.preventDefault();
- });
</del><ins>+ if ( ! view ) {
+ return;
+ }
</ins><span class="cx">
</span><del>- // Make sure we don't eat any content.
- editor.on( 'keydown', function( event ) {
- var selection = editor.selection,
- node, range, view;
</del><ins>+ if ( ! ( ( cursorBefore = dom.hasClass( view, 'wpview-selection-before' ) ) ||
+ ( cursorAfter = dom.hasClass( view, 'wpview-selection-after' ) ) ) ) {
+ return;
+ }
</ins><span class="cx">
</span><del>- if ( event.keyCode === VK.BACKSPACE ) {
- node = selection.getNode();
-
- if ( editor.dom.isEmpty( node ) ) {
- if ( view = getView( node.previousSibling ) ) {
</del><ins>+ if ( ( cursorAfter && key === VK.UP ) || ( cursorBefore && key === VK.BACKSPACE ) ) {
+ if ( view.previousSibling ) {
+ if ( getView( view.previousSibling ) ) {
+ setViewCursor( false, view.previousSibling );
+ } else {
+ if ( dom.isEmpty( view.previousSibling ) && key === VK.BACKSPACE ) {
+ dom.remove( view.previousSibling );
+ } else {
+ selection.select( view.previousSibling, true );
+ selection.collapse();
+ }
+ }
+ } else {
+ setViewCursor( true, view );
+ }
+ event.preventDefault();
+ } else if ( cursorAfter && ( key === VK.DOWN || key === VK.RIGHT ) ) {
+ if ( view.nextSibling ) {
+ if ( getView( view.nextSibling ) ) {
+ setViewCursor( key === VK.RIGHT, view.nextSibling );
+ } else {
+ selection.setCursorLocation( view.nextSibling, 0 );
+ }
+ }
+ event.preventDefault();
+ } else if ( cursorBefore && ( key === VK.UP || key === VK.LEFT ) ) {
+ if ( view.previousSibling ) {
+ if ( getView( view.previousSibling ) ) {
+ setViewCursor( key === VK.UP, view.previousSibling );
+ } else {
+ selection.select( view.previousSibling, true );
+ selection.collapse();
+ }
+ }
+ event.preventDefault();
+ } else if ( cursorBefore && key === VK.DOWN ) {
+ if ( view.nextSibling ) {
+ if ( getView( view.nextSibling ) ) {
+ setViewCursor( true, view.nextSibling );
+ } else {
+ selection.setCursorLocation( view.nextSibling, 0 );
+ }
+ } else {
</ins><span class="cx"> setViewCursor( false, view );
</span><del>- editor.dom.remove( node );
- event.preventDefault();
</del><span class="cx"> }
</span><del>- } else if ( ( range = selection.getRng() ) &&
- range.startOffset === 0 &&
- range.endOffset === 0 &&
- ( view = getView( node.previousSibling ) ) ) {
- setViewCursor( false, view );
</del><span class="cx"> event.preventDefault();
</span><ins>+ } else if ( ( cursorAfter && key === VK.LEFT ) || ( cursorBefore && key === VK.RIGHT ) ) {
+ select( view );
+ event.preventDefault();
+ } else if ( cursorAfter && key === VK.BACKSPACE ) {
+ editor.undoManager.transact( function() {
+ handleEnter( view );
+ dom.remove( view );
+ });
+ event.preventDefault();
+ } else if ( cursorAfter ) {
+ handleEnter( view );
+ } else if ( cursorBefore ) {
+ handleEnter( view , true, key );
</ins><span class="cx"> }
</span><ins>+
+ if ( key === VK.ENTER ) {
+ event.preventDefault();
+ }
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -580,9 +570,12 @@
</span><span class="cx">
</span><span class="cx"> clearInterval( cursorInterval );
</span><span class="cx">
</span><del>- dom.removeClass( views, 'wpview-selection-before' );
- dom.removeClass( views, 'wpview-selection-after' );
- dom.removeClass( views, 'wpview-cursor-hide' );
</del><ins>+ // This runs a lot and is faster than replacing each class separately
+ tinymce.each( views, function ( view ) {
+ if ( view.className ) {
+ view.className = view.className.replace( / ?\bwpview-(?:selection-before|selection-after|cursor-hide)\b/g, '' );
+ }
+ });
</ins><span class="cx">
</span><span class="cx"> if ( focus ) {
</span><span class="cx"> if ( view ) {
</span></span></pre>
</div>
</div>
</body>
</html>