<!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>[36627] trunk: TinyMCE: inline text 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/36627">36627</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/36627","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-02-23 08:32:34 +0000 (Tue, 23 Feb 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: inline text patterns
First run.
See <a href="https://core.trac.wordpress.org/ticket/33300">#33300</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-02-23 03:05:26 UTC (rev 36626)
+++ trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2016-02-23 08:32:34 UTC (rev 36627)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,23 +12,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( tinymce, setTimeout ) {
</span><span class="cx" style="display: block; padding: 0 10px"> tinymce.PluginManager.add( 'wptextpattern', function( editor ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var VK = tinymce.util.VK,
- spacePatterns = [
- { regExp: /^[*-]\s/, cmd: 'InsertUnorderedList' },
- { regExp: /^1[.)]\s/, cmd: 'InsertOrderedList' }
- ],
- enterPatterns = [
- { start: '##', format: 'h2' },
- { start: '###', format: 'h3' },
- { start: '####', format: 'h4' },
- { start: '#####', format: 'h5' },
- { start: '######', format: 'h6' },
- { start: '>', format: 'blockquote' }
- ],
- canUndo, refNode, refPattern;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var VK = tinymce.util.VK;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var spacePatterns = [
+ { regExp: /^[*-]\s/, cmd: 'InsertUnorderedList' },
+ { regExp: /^1[.)]\s/, cmd: 'InsertOrderedList' }
+ ];
+
+ var enterPatterns = [
+ { start: '##', format: 'h2' },
+ { start: '###', format: 'h3' },
+ { start: '####', format: 'h4' },
+ { start: '#####', format: 'h5' },
+ { start: '######', format: 'h6' },
+ { start: '>', format: 'blockquote' }
+ ];
+
+ var inlinePatterns = [
+ { start: '*', end: '*', format: 'italic' },
+ { start: '**', end: '**', format: 'bold' },
+ { start: '_', end: '_', format: 'italic' },
+ { start: '__', end: '__', format: 'bold' },
+ { start: '`', end: '`', format: 'code' }
+ ];
+
+ var canUndo;
+ var refNode;
+ var refPattern;
+ var chars = [];
+ var zeroWidthSpaceNode;
+
+ tinymce.each( inlinePatterns, function( pattern ) {
+ tinymce.each( ( pattern.start + pattern.end ).split( '' ), function( c ) {
+ if ( tinymce.inArray( chars, c ) === -1 ) {
+ chars.push( c );
+ }
+ } );
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'selectionchange', function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var offset;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> canUndo = null;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( zeroWidthSpaceNode ) {
+ offset = zeroWidthSpaceNode.data.indexOf( '\u200b' );
+
+ if ( offset !== -1 ) {
+ zeroWidthSpaceNode.deleteData( offset, offset + 1 );
+ }
+ }
</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"> editor.on( 'keydown', function( event ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,9 +81,85 @@
</span><span class="cx" style="display: block; padding: 0 10px"> space();
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> enter();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( event.keyCode > 47 && ! ( event.keyCode >= 91 && event.keyCode <= 93 ) ) {
+ inline();
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function inline() {
+ var rng = editor.selection.getRng();
+ var node = rng.startContainer;
+ var offset = rng.startOffset;
+ var startOffset;
+ var endOffset;
+ var pattern;
+ var format;
+ var zero;
+
+ if ( node.nodeType !== 3 || ! node.data.length || ! offset ) {
+ return;
+ }
+
+ if ( tinymce.inArray( chars, node.data.charAt( offset - 1 ) ) === -1 ) {
+ return;
+ }
+
+ function findStart( node ) {
+ var i = inlinePatterns.length;
+ var offset;
+
+ while ( i-- ) {
+ pattern = inlinePatterns[ i ];
+ offset = node.data.indexOf( pattern.end );
+
+ if ( offset !== -1 ) {
+ return offset;
+ }
+ }
+ }
+
+ startOffset = findStart( node );
+ endOffset = node.data.lastIndexOf( pattern.end );
+
+ if ( startOffset === endOffset || endOffset === -1 ) {
+ return;
+ }
+
+ if ( endOffset - startOffset <= pattern.start.length ) {
+ return;
+ }
+
+ if ( node.data.slice( startOffset + pattern.start.length, endOffset ).indexOf( pattern.start.slice( 0, 1 ) ) !== -1 ) {
+ return;
+ }
+
+ format = editor.formatter.get( pattern.format );
+
+ if ( format && format[0].inline ) {
+ editor.undoManager.add();
+
+ editor.undoManager.transact( function() {
+ node.insertData( offset, '\u200b' );
+
+ node = node.splitText( startOffset );
+ zero = node.splitText( offset - startOffset );
+
+ node.deleteData( 0, pattern.start.length );
+ node.deleteData( node.data.length - pattern.end.length, pattern.end.length );
+
+ editor.formatter.apply( pattern.format, {}, node );
+
+ editor.selection.setCursorLocation( zero, 1 );
+ } );
+
+ // We need to wait for native events to be triggered.
+ setTimeout( function() {
+ canUndo = 'space';
+ zeroWidthSpaceNode = zero;
+ } );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function firstTextNode( node ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var parent = editor.dom.getParent( node, 'p' ),
</span><span class="cx" style="display: block; padding: 0 10px"> child;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,11 +266,7 @@
</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"> function ltrim( text ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( text ) {
- return text.replace( /^\s+/, '' );
- }
-
- return '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return text ? text.replace( /^\s+/, '' ) : '';
</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 enter() {
</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-02-23 03:05:26 UTC (rev 36626)
+++ trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2016-02-23 08:32:34 UTC (rev 36627)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '0': 48, '1': 49, '2': 50, '3': 51, '4': 52, '5': 53, '6': 54, '7': 55, '8': 56, '9': 57,'a': 65, 'b': 66, 'c': 67,
</span><span class="cx" style="display: block; padding: 0 10px"> 'd': 68, 'e': 69, 'f': 70, 'g': 71, 'h': 72, 'i': 73, 'j': 74, 'k': 75, 'l': 76, 'm': 77, 'n': 78, 'o': 79, 'p': 80, 'q': 81,
</span><span class="cx" style="display: block; padding: 0 10px"> 'r': 82, 's': 83, 't': 84, 'u': 85, 'v': 86, 'w': 87, 'x': 88, 'y': 89, ' ': 32, ',': 188, '-': 189, '.': 190, '/': 191, '\\': 220,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '[': 219, ']': 221, '\'': 222, ';': 186, '=': 187, ')': 41
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '[': 219, ']': 221, '\'': 222, ';': 186, '=': 187, ')': 41,
+ '*': 48 // Anything will do.
</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"> return lookup[String.fromCharCode(charCode)];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,4 +278,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> assert.equal( editor.getContent(), '<p>### </p>\n<p> </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( 'Inline: single.', function( assert ) {
+ type( '*test*', function() {
+ assert.equal( editor.getContent(), '<p><em>test</em></p>' );
+ assert.equal( editor.selection.getRng().startOffset, 1 );
+ }, assert.async() );
+ } );
+
+ QUnit.test( 'Inline: double.', function( assert ) {
+ type( '**test**', function() {
+ assert.equal( editor.getContent(), '<p><strong>test</strong></p>' );
+ assert.equal( editor.selection.getRng().startOffset, 1 );
+ }, assert.async() );
+ } );
+
+ QUnit.test( 'Inline: after typing.', function( assert ) {
+ editor.setContent( '<p>test test test</p>' );
+ editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 5 );
+
+ type( '**', function() {
+ editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 11 );
+ }, '**', function() {
+ assert.equal( editor.getContent(), '<p>test <strong>test</strong> test</p>' );
+ assert.equal( editor.selection.getRng().startOffset, 1 );
+ }, assert.async() );
+ } );
+
+ QUnit.test( 'Inline: no change.', function( assert ) {
+ type( '******', function() {
+ assert.equal( editor.getContent(), '<p>******</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>