<!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>[29022] 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/29022">29022</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-07-08 04:15:00 +0000 (Tue, 08 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE wpView:
- Improve the fake caret hide/show.
- Improve getView() speed.
- Add callback for showing the proper path when a view is selected. This currently doesn't work, will start working after we update TinyMCE.
props avryl, see <a href="http://core.trac.wordpress.org/ticket/28567">#28567</a>, <a href="http://core.trac.wordpress.org/ticket/28595">#28595</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 (29021 => 29022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-07-08 00:32:29 UTC (rev 29021)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-07-08 04:15:00 UTC (rev 29022)
</span><span class="lines">@@ -12,9 +12,16 @@
</span><span class="cx"> cursorInterval, lastKeyDownNode, setViewCursorTries, focus;
</span><span class="cx">
</span><span class="cx"> function getView( node ) {
</span><del>- return editor.dom.getParent( node, function( node ) {
- return editor.dom.hasClass( node, 'wpview-wrap' );
- });
</del><ins>+ // Doing this directly is about 40% faster
+ while ( node && node.parentNode ) {
+ if ( node.className && (' ' + node.className + ' ').indexOf(' wpview-wrap ') !== -1 ) {
+ return node;
+ }
+
+ node = node.parentNode;
+ }
+
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -55,6 +62,7 @@
</span><span class="cx"> function setViewCursor( before, view ) {
</span><span class="cx"> var location = before ? 'before' : 'after',
</span><span class="cx"> offset = before ? 0 : 1;
</span><ins>+ deselect();
</ins><span class="cx"> editor.selection.setCursorLocation( editor.dom.select( '.wpview-selection-' + location, view )[0], offset );
</span><span class="cx"> editor.nodeChanged();
</span><span class="cx"> }
</span><span class="lines">@@ -111,6 +119,8 @@
</span><span class="cx"> dom.bind( clipboard, 'beforedeactivate focusin focusout', _stop );
</span><span class="cx"> dom.bind( selected, 'beforedeactivate focusin focusout', _stop );
</span><span class="cx">
</span><ins>+ tinymce.DOM.addClass( editor.getContainer(), 'wpview-selected' );
+
</ins><span class="cx"> // Make sure that the editor is focused.
</span><span class="cx"> // It is possible that the editor is not focused when the mouse event fires
</span><span class="cx"> // without focus, the selection will not work properly.
</span><span class="lines">@@ -274,6 +284,8 @@
</span><span class="cx"> var view = getView( event.target ),
</span><span class="cx"> deselectEventType;
</span><span class="cx">
</span><ins>+ firstFocus = false;
+
</ins><span class="cx"> // Contain clicks inside the view wrapper
</span><span class="cx"> if ( view ) {
</span><span class="cx"> event.stopPropagation();
</span><span class="lines">@@ -484,33 +496,32 @@
</span><span class="cx">
</span><span class="cx"> if ( keyCode === VK.LEFT ) {
</span><span class="cx"> setViewCursor( true, view );
</span><del>- deselect();
</del><span class="cx"> } else if ( keyCode === VK.UP ) {
</span><span class="cx"> if ( view.previousSibling ) {
</span><span class="cx"> if ( getView( view.previousSibling ) ) {
</span><span class="cx"> setViewCursor( true, view.previousSibling );
</span><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><span class="cx"> } else {
</span><span class="cx"> setViewCursor( true, view );
</span><span class="cx"> }
</span><del>- deselect();
</del><ins>+
</ins><span class="cx"> } else if ( keyCode === VK.RIGHT ) {
</span><span class="cx"> setViewCursor( false, view );
</span><del>- deselect();
</del><span class="cx"> } else if ( keyCode === VK.DOWN ) {
</span><span class="cx"> if ( view.nextSibling ) {
</span><span class="cx"> if ( getView( view.nextSibling ) ) {
</span><span class="cx"> setViewCursor( false, view.nextSibling );
</span><span class="cx"> } else {
</span><ins>+ deselect();
</ins><span class="cx"> selection.setCursorLocation( view.nextSibling, 0 );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> setViewCursor( false, view );
</span><span class="cx"> }
</span><del>- deselect();
</del><span class="cx"> } else if ( keyCode === VK.ENTER ) {
</span><span class="cx"> handleEnter( view );
</span><span class="cx"> } else if ( keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
</span><span class="lines">@@ -586,38 +597,61 @@
</span><span class="cx"> dom.removeClass( views, 'wpview-selection-after' );
</span><span class="cx"> dom.removeClass( views, 'wpview-cursor-hide' );
</span><span class="cx">
</span><del>- if ( view && editor.selection.isCollapsed() && focus ) {
- if ( className === 'wpview-selection-before' || className === 'wpview-selection-after' ) {
- setViewCursorTries = 0;
</del><ins>+ if ( ! selected ) {
+ tinymce.DOM.removeClass( editor.getContainer(), 'wpview-selected' );
+ }
</ins><span class="cx">
</span><del>- // Make sure the cursor arrived in the right node.
- // This is necessary for Firefox.
- if ( lKDN === view.previousSibling ) {
- setViewCursor( true, view );
- return;
- } else if ( lKDN === view.nextSibling ) {
- setViewCursor( false, view );
- return;
- }
</del><ins>+ if ( focus ) {
+ if ( view ) {
+ if ( className === 'wpview-selection-before' || className === 'wpview-selection-after' && editor.selection.isCollapsed() ) {
+ setViewCursorTries = 0;
</ins><span class="cx">
</span><del>- dom.addClass( view, className );
</del><ins>+ deselect();
</ins><span class="cx">
</span><del>- cursorInterval = setInterval( function() {
- if ( dom.hasClass( view, 'wpview-cursor-hide' ) ) {
- dom.removeClass( view, 'wpview-cursor-hide' );
- } else {
- dom.addClass( view, 'wpview-cursor-hide' );
</del><ins>+ tinymce.DOM.addClass( editor.getContainer(), 'wpview-selected' );
+
+ // Make sure the cursor arrived in the right node.
+ // This is necessary for Firefox.
+ if ( lKDN === view.previousSibling ) {
+ setViewCursor( true, view );
+ return;
+ } else if ( lKDN === view.nextSibling ) {
+ setViewCursor( false, view );
+ return;
</ins><span class="cx"> }
</span><del>- }, 500 );
- // If the cursor happens to be anywhere around the view, then set the cursor properly.
- // Only try this once to prevent a loop. (You never know.)
- } else if ( ! selected && ! setViewCursorTries ) {
- setViewCursorTries++;
- setViewCursor( true, view );
</del><ins>+
+ dom.addClass( view, className );
+
+ cursorInterval = setInterval( function() {
+ if ( dom.hasClass( view, 'wpview-cursor-hide' ) ) {
+ dom.removeClass( view, 'wpview-cursor-hide' );
+ } else {
+ dom.addClass( view, 'wpview-cursor-hide' );
+ }
+ }, 500 );
+ // If the cursor lands anywhere else in the view, set the cursor before it.
+ // Only try this once to prevent a loop. (You never know.)
+ } else if ( className !== 'wpview-clipboard' && ! setViewCursorTries ) {
+ deselect();
+ setViewCursorTries++;
+ setViewCursor( true, view );
+ }
+ } else {
+ deselect();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ editor.on( 'resolvename', function( event ) {
+ if ( editor.dom.hasClass( event.target, 'wpview-wrap' ) ) {
+ event.name = editor.dom.getAttrib( event.target, 'data-wpview-type' ) || 'wpview';
+ event.stopPropagation();
+ } else if ( getView( event.target ) ) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ });
+
</ins><span class="cx"> return {
</span><span class="cx"> getViewText: getViewText,
</span><span class="cx"> setViewText: setViewText
</span></span></pre>
</div>
</div>
</body>
</html>