<!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>[29246] trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js: TinyMCE wpView: better removal of views, replace a selected view when pasting.</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/29246">29246</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-07-19 07:29:34 +0000 (Sat, 19 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE wpView: better removal of views, replace a selected view when pasting. 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 (29245 => 29246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-07-19 06:28:38 UTC (rev 29245)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-07-19 07:29:34 UTC (rev 29246)
</span><span class="lines">@@ -101,6 +101,15 @@
</span><span class="cx"> editor.nodeChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function removeView( view ) {
+ // TODO: trigger an event to run a clean up function.
+ // Maybe `jQuery( view ).trigger( 'remove' );`?
+ editor.undoManager.transact( function() {
+ handleEnter( view );
+ editor.dom.remove( view );
+ });
+ }
+
</ins><span class="cx"> function select( viewNode ) {
</span><span class="cx"> var clipboard,
</span><span class="cx"> dom = editor.dom;
</span><span class="lines">@@ -185,6 +194,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( selected ) {
+ removeView( selected );
+ }
+
</ins><span class="cx"> if ( ! event.initial ) {
</span><span class="cx"> wp.mce.views.unbind( editor );
</span><span class="cx"> }
</span><span class="lines">@@ -293,7 +306,7 @@
</span><span class="cx"> if ( editor.dom.hasClass( event.target, 'edit' ) ) {
</span><span class="cx"> wp.mce.views.edit( view );
</span><span class="cx"> } else if ( editor.dom.hasClass( event.target, 'remove' ) ) {
</span><del>- editor.dom.remove( view );
</del><ins>+ removeView( view );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -340,20 +353,15 @@
</span><span class="cx"> dom = editor.dom,
</span><span class="cx"> selection = editor.selection,
</span><span class="cx"> node, view, cursorBefore, cursorAfter,
</span><del>- range, clonedRange, tempRange, remove;
</del><ins>+ range, clonedRange, tempRange;
</ins><span class="cx">
</span><span class="cx"> if ( selected ) {
</span><del>- // 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 );
- }
</del><ins>+ // Ignore key presses that involve the command or control key, but continue when in combination with backspace or v.
+ // Also ignore the F# keys.
+ if ( ( ( event.metaKey || event.ctrlKey ) && key !== VK.BACKSPACE && key !== 86 ) || ( key >= 112 && key <= 123 ) ) {
+ // Remove the view when pressing cmd/ctrl+x on keyup, otherwise the browser can't copy the content.
+ if ( ( event.metaKey || event.ctrlKey ) && key === 88 ) {
+ toRemove = selected;
</ins><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -399,11 +407,7 @@
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> // Ignore keys that don't insert anything.
</span><span class="cx"> } else if ( ( key > 47 || VK.SPACEBAR || key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE ) && key !== 144 && key !== 145 ) {
</span><del>- editor.undoManager.transact( function() {
- remove = selected;
- handleEnter( selected );
- dom.remove( remove );
- });
</del><ins>+ removeView( selected );
</ins><span class="cx">
</span><span class="cx"> if ( key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE ) {
</span><span class="cx"> event.preventDefault();
</span><span class="lines">@@ -437,26 +441,23 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Make sure we don't eat any content.
- if ( event.keyCode === VK.BACKSPACE ) {
- if ( editor.dom.isEmpty( node ) ) {
- if ( view = getView( node.previousSibling ) ) {
</del><ins>+ if ( ! view ) {
+ // 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();
+ }
+ } else if ( ( range = selection.getRng() ) &&
+ range.startOffset === 0 &&
+ range.endOffset === 0 &&
+ ( view = getView( node.previousSibling ) ) ) {
</ins><span class="cx"> setViewCursor( false, view );
</span><del>- editor.dom.remove( node );
</del><span class="cx"> event.preventDefault();
</span><del>- return;
</del><span class="cx"> }
</span><del>- } else if ( ( range = selection.getRng() ) &&
- range.startOffset === 0 &&
- range.endOffset === 0 &&
- ( view = getView( node.previousSibling ) ) ) {
- setViewCursor( false, view );
- event.preventDefault();
- return;
</del><span class="cx"> }
</span><del>- }
-
- if ( ! view ) {
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -515,10 +516,7 @@
</span><span class="cx"> select( view );
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> } else if ( cursorAfter && key === VK.BACKSPACE ) {
</span><del>- editor.undoManager.transact( function() {
- handleEnter( view );
- dom.remove( view );
- });
</del><ins>+ removeView( view );
</ins><span class="cx"> event.preventDefault();
</span><span class="cx"> } else if ( cursorAfter ) {
</span><span class="cx"> handleEnter( view );
</span><span class="lines">@@ -534,7 +532,7 @@
</span><span class="cx">
</span><span class="cx"> editor.on( 'keyup', function() {
</span><span class="cx"> if ( toRemove ) {
</span><del>- editor.dom.remove( toRemove );
</del><ins>+ removeView( toRemove );
</ins><span class="cx"> toRemove = false;
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>