<!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>[39075] trunk: TinyMCE: wptextpattern: Handle unconverted inline patterns</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/39075">39075</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/39075","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-11-01 20:05:48 +0000 (Tue, 01 Nov 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: Handle unconverted inline patterns
Make sure the right text is matched when it already contains characters of the pattern.
Adds two more unit tests.
Fixes <a href="https://core.trac.wordpress.org/ticket/37693">#37693</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="#trunktestsqunitindexhtml">trunk/tests/qunit/index.html</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-11-01 19:55:46 UTC (rev 39074)
+++ trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2016-11-01 20:05:48 UTC (rev 39075)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,15 +15,27 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Escapes characters for use in a Regular Expression.
+ *
+ * @param {String} string Characters to escape
+ *
+ * @return {String} Escaped characters
+ */
+ function escapeRegExp( string ) {
+ return string.replace( /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> tinymce.PluginManager.add( 'wptextpattern', function( editor ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var VK = tinymce.util.VK;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var settings = editor.settings.wptextpattern || {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var spacePatterns = [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var spacePatterns = settings.space || [
</ins><span class="cx" style="display: block; padding: 0 10px"> { regExp: /^[*-]\s/, cmd: 'InsertUnorderedList' },
</span><span class="cx" style="display: block; padding: 0 10px"> { regExp: /^1[.)]\s/, cmd: 'InsertOrderedList' }
</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">- var enterPatterns = [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var enterPatterns = settings.enter || [
</ins><span class="cx" style="display: block; padding: 0 10px"> { start: '##', format: 'h2' },
</span><span class="cx" style="display: block; padding: 0 10px"> { start: '###', format: 'h3' },
</span><span class="cx" style="display: block; padding: 0 10px"> { start: '####', format: 'h4' },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> { regExp: /^(-){3,}$/, element: 'hr' }
</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">- var inlinePatterns = [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var inlinePatterns = settings.inline || [
</ins><span class="cx" style="display: block; padding: 0 10px"> { start: '`', end: '`', format: 'code' }
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,40 +93,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var format;
</span><span class="cx" style="display: block; padding: 0 10px"> var zero;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // We need a non empty text node with an offset greater than zero.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! node || node.nodeType !== 3 || ! node.data.length || ! offset ) {
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The ending character should exist in the patterns registered.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( tinymce.inArray( chars, node.data.charAt( offset - 1 ) ) === -1 ) {
</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 findStart( node ) {
- var i = inlinePatterns.length;
- var offset;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var string = node.data.slice( 0, offset );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( i-- ) {
- pattern = inlinePatterns[ i ];
- offset = node.data.indexOf( pattern.end );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ tinymce.each( inlinePatterns, function( p ) {
+ var regExp = new RegExp( escapeRegExp( p.start ) + '\\S+' + escapeRegExp( p.end ) + '$' );
+ var match = string.match( regExp );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( offset !== -1 ) {
- return offset;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! match ) {
+ return;
</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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- startOffset = findStart( node );
- endOffset = node.data.lastIndexOf( pattern.end );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't allow pattern characters in the text.
+ if ( node.data.slice( match.index + p.start.length, offset - p.end.length ).indexOf( p.start.slice( 0, 1 ) ) !== -1 ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( startOffset === endOffset || endOffset === -1 ) {
- return;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ startOffset = match.index;
+ endOffset = offset - p.end.length;
+ pattern = p;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( endOffset - startOffset <= pattern.start.length ) {
- return;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( node.data.slice( startOffset + pattern.start.length, endOffset ).indexOf( pattern.start.slice( 0, 1 ) ) !== -1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! pattern ) {
</ins><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></span></pre></div>
<a id="trunktestsqunitindexhtml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/index.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/index.html 2016-11-01 19:55:46 UTC (rev 39074)
+++ trunk/tests/qunit/index.html 2016-11-01 20:05:48 UTC (rev 39075)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,6 +491,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #widgets-left -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- end widget templates -->
</span><span class="cx" style="display: block; padding: 0 10px"> <script src="../../src/wp-includes/js/tinymce/tinymce.js"></script>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <script src="../../src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js"></script>
</ins><span class="cx" style="display: block; padding: 0 10px"> <script src="editor/js/utils.js"></script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script src="wp-includes/js/tinymce/plugins/wptextpattern/plugin.js"></script>
</span><span class="cx" style="display: block; padding: 0 10px">
</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-11-01 19:55:46 UTC (rev 39074)
+++ trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2016-11-01 20:05:48 UTC (rev 39075)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,6 +155,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> selector: '#editor',
</span><span class="cx" style="display: block; padding: 0 10px"> skin: false,
</span><span class="cx" style="display: block; padding: 0 10px"> plugins: 'wptextpattern',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wptextpattern: {
+ inline: [
+ { start: '`', end: '`', format: 'code' },
+ { start: '``', end: '``', format: 'bold' }
+ ]
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> init_instance_callback: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> editor = arguments[0];
</span><span class="cx" style="display: block; padding: 0 10px"> editor.focus();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,19 +305,26 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- QUnit.test( 'Inline: single.', function( assert ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ QUnit.test( 'Inline: single character.', function( assert ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> type( '`test`', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> assert.equal( editor.getContent(), '<p><code>test</code></p>' );
</span><span class="cx" style="display: block; padding: 0 10px"> assert.equal( editor.selection.getRng().startOffset, 1 );
</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( 'Inline: two characters.', function( assert ) {
+ type( '``test``', function() {
+ assert.equal( editor.getContent(), '<p><strong>test</strong></p>' );
+ assert.equal( editor.selection.getRng().startOffset, 1 );
+ }, assert.async() );
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> QUnit.test( 'Inline: after typing.', function( assert ) {
</span><span class="cx" style="display: block; padding: 0 10px"> editor.setContent( '<p>test test test</p>' );
</span><span class="cx" style="display: block; padding: 0 10px"> editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> type( '`', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 11 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }, '`', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> assert.equal( editor.getContent(), '<p>test <code>test</code> test</p>' );
</span><span class="cx" style="display: block; padding: 0 10px"> assert.equal( editor.selection.getRng().startOffset, 1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,4 +336,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> assert.equal( editor.getContent(), '<p>test `````</p>' );
</span><span class="cx" style="display: block; padding: 0 10px"> }, assert.async() );
</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( 'Convert with previously unconverted pattern', function( assert ) {
+ editor.setContent( '<p>`test` test </p>' );
+ editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 12 );
+
+ type( '`test`', function() {
+ assert.equal( editor.getContent(), '<p>`test` test <code>test</code></p>' );
+ }, assert.async() );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> } )( window.jQuery, window.QUnit, window.tinymce, window.setTimeout );
</span></span></pre>
</div>
</div>
</body>
</html>