<!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>[36719] trunk: TinyMCE: textpattern: clean up</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/36719">36719</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/36719","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-26 00:51:01 +0000 (Fri, 26 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: textpattern: clean up
* Use editor.once instead of storing into variables.
* Add pattern for hr.
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-26 00:38:25 UTC (rev 36718)
+++ trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2016-02-26 00:51:01 UTC (rev 36719)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> { start: '####', format: 'h4' },
</span><span class="cx" style="display: block; padding: 0 10px"> { start: '#####', format: 'h5' },
</span><span class="cx" style="display: block; padding: 0 10px"> { start: '######', format: 'h6' },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- { start: '>', format: 'blockquote' }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ { start: '>', format: 'blockquote' },
+ { regExp: /^\s*(?:(?:\* ?){3,}|(?:_ ?){3,}|(?:- ?){3,})\s*$/, element: 'hr' }
</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"> var inlinePatterns = [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,10 +38,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"> var canUndo;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var refNode;
- var refPattern;
</del><span class="cx" style="display: block; padding: 0 10px"> var chars = [];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var zeroWidthSpaceNode;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> tinymce.each( inlinePatterns, function( pattern ) {
</span><span class="cx" style="display: block; padding: 0 10px"> tinymce.each( ( pattern.start + pattern.end ).split( '' ), function( c ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,17 +49,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.on( 'selectionchange', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var offset;
-
</del><span class="cx" style="display: block; padding: 0 10px"> canUndo = null;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( zeroWidthSpaceNode ) {
- offset = zeroWidthSpaceNode.data.indexOf( '\u200b' );
-
- if ( offset !== -1 ) {
- zeroWidthSpaceNode.deleteData( offset, offset + 1 );
- }
- }
</del><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">@@ -72,15 +60,13 @@
</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"> if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- watchEnter();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ enter();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'keyup', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( event.keyCode === VK.SPACEBAR && ! event.ctrlKey && ! event.metaKey && ! event.altKey ) {
</span><span class="cx" style="display: block; padding: 0 10px"> space();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) {
- enter();
</del><span class="cx" style="display: block; padding: 0 10px"> } else if ( event.keyCode > 47 && ! ( event.keyCode >= 91 && event.keyCode <= 93 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> inline();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +141,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // We need to wait for native events to be triggered.
</span><span class="cx" style="display: block; padding: 0 10px"> setTimeout( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> canUndo = 'space';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- zeroWidthSpaceNode = zero;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ editor.once( 'selectionchange', function() {
+ var offset;
+
+ if ( zero ) {
+ offset = zero.data.indexOf( '\u200b' );
+
+ if ( offset !== -1 ) {
+ zero.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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +230,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function watchEnter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function enter() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var rng = editor.selection.getRng(),
</span><span class="cx" style="display: block; padding: 0 10px"> start = rng.startContainer,
</span><span class="cx" style="display: block; padding: 0 10px"> node = firstTextNode( start ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,10 +244,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> text = node.data;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ( i-- ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( text.indexOf( enterPatterns[ i ].start ) === 0 ) {
- pattern = enterPatterns[ i ];
- break;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( enterPatterns[ i ].start ) {
+ if ( text.indexOf( enterPatterns[ i ].start ) === 0 ) {
+ pattern = enterPatterns[ i ];
+ break;
+ }
+ } else if ( enterPatterns[ i ].regExp ) {
+ if ( enterPatterns[ i ].regExp.test( text ) ) {
+ pattern = enterPatterns[ i ];
+ break;
+ }
+ }
</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"> if ( ! pattern ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,31 +265,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">- refNode = node;
- refPattern = pattern;
- }
-
- function ltrim( text ) {
- return text ? text.replace( /^\s+/, '' ) : '';
- }
-
- function enter() {
- if ( refNode ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.once( 'keyup', function() {
</ins><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">- editor.formatter.apply( refPattern.format, {}, refNode );
- refNode.replaceData( 0, refNode.data.length, ltrim( refNode.data.slice( refPattern.start.length ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( pattern.format ) {
+ editor.formatter.apply( pattern.format, {}, node );
+ node.replaceData( 0, node.data.length, ltrim( node.data.slice( pattern.start.length ) ) );
+ } else if ( pattern.element ) {
+ editor.getBody().replaceChild( document.createElement( pattern.element ), node.parentNode );
+ }
</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="cx" style="display: block; padding: 0 10px"> setTimeout( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> canUndo = '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">- }
</del><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">- refNode = null;
- refPattern = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function ltrim( text ) {
+ 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"> } )( 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 2016-02-26 00:38:25 UTC (rev 36718)
+++ trunk/tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2016-02-26 00:51:01 UTC (rev 36719)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,8 +306,14 @@
</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"> QUnit.test( 'Inline: no change.', function( assert ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- type( '******', function() {
- assert.equal( editor.getContent(), '<p>******</p>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ type( 'test ******', function() {
+ assert.equal( editor.getContent(), '<p>test ******</p>' );
</ins><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( 'Horizontal Rule', function( assert ) {
+ type( ' --- \n', function() {
+ assert.equal( editor.getContent(), '<hr />\n<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>