<!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>[33452] trunk: TinyMCE: wptextpattern: headings on enter</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/33452">33452</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/33452","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>2015-07-27 23:15:15 +0000 (Mon, 27 Jul 2015)</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: headings on enter
Fixes <a href="https://core.trac.wordpress.org/ticket/31441">#31441</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 2015-07-27 22:07:27 UTC (rev 33451)
+++ trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2015-07-27 23:15:15 UTC (rev 33452)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,40 +14,20 @@
</span><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 $$ = editor.$,
</span><span class="cx" style="display: block; padding: 0 10px"> VK = tinymce.util.VK,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- patterns = [],
- canUndo = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ canUndo = false,
+ 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' }
+ ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Add a pattern to format with a callback.
- *
- * @since 4.3.0
- *
- * @param {RegExp} regExp RegEx pattern.
- * @param {Function} callback Callback.
- */
- function add( regExp, callback ) {
- patterns.push( {
- regExp: regExp,
- callback: callback
- } );
- }
-
- add( /^[*-]\s/, function() {
- this.execCommand( 'InsertUnorderedList' );
- } );
-
- add( /^1[.)]\s/, function() {
- this.execCommand( 'InsertOrderedList' );
- } );
-
- add( /^>\s/, function() {
- this.formatter.toggle( 'blockquote' );
- } );
-
- add( /^(#{2,6})\s/, function() {
- this.formatter.toggle( 'h' + arguments[1].length );
- } );
-
</del><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'selectionchange', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> canUndo = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,24 +37,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.undoManager.undo();
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><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">- editor.on( 'keyup', function( event ) {
- var rng, node, text, parent, child;
-
- if ( event.keyCode !== VK.SPACEBAR ) {
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
+ enter();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- rng = editor.selection.getRng();
- node = rng.startContainer;
-
- if ( ! node || node.nodeType !== 3 ) {
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.on( 'keyup', function( event ) {
+ if ( event.keyCode === VK.SPACEBAR || ! VK.modifierPressed( event ) ) {
+ space();
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- text = node.nodeValue;
- parent = editor.dom.getParent( node, 'p' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function firstNode( node ) {
+ var parent = editor.dom.getParent( node, 'p' ),
+ child;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,21 +69,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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! child.nodeValue ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! child.data ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> child = child.nextSibling;
</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">- if ( child !== node ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return child;
+ }
+
+ function space() {
+ var rng = editor.selection.getRng(),
+ node = rng.startContainer,
+ text;
+
+ if ( firstNode( node ) !== node ) {
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tinymce.each( patterns, function( pattern ) {
- var args,
- replace = text.replace( pattern.regExp, function() {
- args = arguments;
- return '';
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ text = node.data;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ tinymce.each( spacePatterns, function( pattern ) {
+ var replace = text.replace( pattern.regExp, '' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( text === replace ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,12 +101,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.undoManager.add();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> editor.undoManager.transact( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $$parent;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var parent = node.parentNode,
+ $$parent;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( replace ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $$( node ).replaceWith( document.createTextNode( replace ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $$parent = $$( node.parentNode );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $$parent = $$( parent );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $$( node ).remove();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,8 +117,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"> editor.selection.setCursorLocation( parent );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- pattern.callback.apply( editor, args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.execCommand( pattern.cmd );
</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"> // We need to wait for native events to be triggered.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,6 +127,53 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><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">+ }
+
+ function enter() {
+ var selection = editor.selection,
+ rng = selection.getRng(),
+ offset = rng.startOffset,
+ start = rng.startContainer,
+ node = firstNode( start ),
+ i = enterPatterns.length,
+ text, pattern;
+
+ if ( ! node ) {
+ return;
+ }
+
+ text = node.data;
+
+ while ( i-- ) {
+ if ( text.indexOf( enterPatterns[ i ].start ) === 0 ) {
+ pattern = enterPatterns[ i ];
+ break;
+ }
+ }
+
+ if ( ! pattern ) {
+ return;
+ }
+
+ if ( node === start ) {
+ if ( tinymce.trim( text ) === pattern.start ) {
+ return;
+ }
+
+ offset = Math.max( 0, offset - pattern.start.length );
+ }
+
+ editor.undoManager.add();
+
+ editor.undoManager.transact( function() {
+ node.deleteData( 0, pattern.start.length );
+
+ editor.formatter.apply( pattern.format, {}, start );
+
+ rng.setStart( start, offset );
+ rng.collapse( true );
+ selection.setRng( rng );
+ } );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> } )( window.tinymce, window.setTimeout );
</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 2015-07-27 22:07:27 UTC (rev 33451)
+++ trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2015-07-27 23:15:15 UTC (rev 33452)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,4 +144,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> assert.equal( editor.getContent(), '<ul>\n<li>tes</li>\n</ul>' );
</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( 'Heading 3', function( assert ) {
+ editor.setContent( '<p>### test</p>' );
+ editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 8 );
+
+ type( '\n', function() {
+ assert.equal( editor.getContent(), '<h3>test</h3>\n<p> </p>' );
+ }, assert.async() );
+ } );
+
+ QUnit.test( 'Heading 3 with elements.', function( assert ) {
+ editor.setContent( '<p>###<del>test</del></p>' );
+ editor.selection.setCursorLocation( editor.$( 'del' )[0].firstChild, 4 );
+
+ type( '\n', function() {
+ assert.equal( editor.getContent(), '<h3><del>test</del></h3>\n<p> </p>' );
+ }, assert.async() );
+ } );
+
+ QUnit.test( 'Don\'t convert without content', function( assert ) {
+ editor.setContent( '<p>### </p>' );
+ editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 4 );
+
+ type( '\n', function() {
+ assert.equal( editor.getContent(), '<p>### </p>\n<p> </p>' );
+ }, assert.async() );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> } )( window.jQuery, window.QUnit, window.tinymce, window.Utils.type, window.setTimeout );
</span></span></pre>
</div>
</div>
</body>
</html>