<!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>[37668] trunk: TinyMCE: wptextpattern: fix for fast typing</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/37668">37668</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/37668","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iseulde</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-09 19:06:25 +0000 (Thu, 09 Jun 2016)</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: wptextpattern: fix for fast typing
Props jnylen0, iseulde.
Fixes <a href="https://core.trac.wordpress.org/ticket/36585">#36585</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswptextpatternpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js</a></li>
<li><a href="#trunktestsqunitwpincludesjstinymcepluginswptextpatternpluginjs">trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjstinymcepluginswptextpatternpluginjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2016-06-09 18:09:25 UTC (rev 37667)
+++ trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2016-06-09 19:06:25 UTC (rev 37668)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,15 +62,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> enter();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }, true );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editor.on( 'keyup', function( event ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Wait for the browser to insert the character.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( event.keyCode === VK.SPACEBAR && ! event.ctrlKey && ! event.metaKey && ! event.altKey ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- space();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setTimeout( space );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( event.keyCode > 47 && ! ( event.keyCode >= 91 && event.keyCode <= 93 ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- inline();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setTimeout( inline );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function inline() {
</span><span class="cx" style="display: block; padding: 0 10px"> var rng = editor.selection.getRng();
</span></span></pre></div>
<a id="trunktestsqunitwpincludesjstinymcepluginswptextpatternpluginjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2016-06-09 18:09:25 UTC (rev 37667)
+++ trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2016-06-09 19:06:25 UTC (rev 37668)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function mceType(chr) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function mceType( chr, noKeyUp ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var editor = tinymce.activeEditor, keyCode, charCode, evt, startElm, rng, startContainer, startOffset, textNode;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function charCodeToKeyCode(charCode) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,13 +109,18 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fakeEvent(startElm, 'keyup', evt);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! noKeyUp ) {
+ fakeEvent(startElm, 'keyup', evt);
+ }
</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"> function type() {
</span><span class="cx" style="display: block; padding: 0 10px"> var args = arguments;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Wait once for conversions to be triggered,
+ // and once for the `canUndo` flag to be set.
</ins><span class="cx" style="display: block; padding: 0 10px"> setTimeout( function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setTimeout( function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( typeof args[0] === 'string' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> args[0] = args[0].split( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,6 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> type.apply( null, args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } );
</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"> QUnit.module( 'tinymce.plugins.wptextpattern', {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,6 +183,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, assert.async() );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ QUnit.test( 'Unordered list. (fast)', function( assert ) {
+ type( '*', function() {
+ mceType( ' ', true );
+ }, 'a', function() {
+ assert.equal( editor.getContent(), '<ul>\n<li>a</li>\n</ul>' );
+ }, assert.async() );
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> QUnit.test( 'Ordered list.', function( assert ) {
</span><span class="cx" style="display: block; padding: 0 10px"> type( '1. a', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> assert.equal( editor.getContent(), '<ol>\n<li>a</li>\n</ol>' );
</span></span></pre>
</div>
</div>
</body>
</html>