<!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>[36761] trunk/src/wp-includes: TinyMCE textpattern:</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/36761">36761</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/36761","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-28 18:59:25 +0000 (Sun, 28 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:
- Add description of the new patterns to the Shortcuts help modal.
- Fix the layout a bit and make the patterns in two columns.
- Disable the `textpatterns` plugin in IE < 9.
See <a href="https://core.trac.wordpress.org/ticket/33300">#33300</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludescsseditorcss">trunk/src/wp-includes/css/editor.css</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswptextpatternpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpeditorphp"></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/class-wp-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-editor.php 2016-02-28 18:35:25 UTC (rev 36760)
+++ trunk/src/wp-includes/class-wp-editor.php 2016-02-28 18:59:25 UTC (rev 36761)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1066,6 +1066,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' =>
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' =>
+ __( 'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' ),
</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></pre></div>
<a id="trunksrcwpincludescsseditorcss"></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/css/editor.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/editor.css 2016-02-28 18:35:25 UTC (rev 36760)
+++ trunk/src/wp-includes/css/editor.css 2016-02-28 18:59:25 UTC (rev 36761)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,6 +136,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 20px;
</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">+.mce-window .wp-editor-help table.wp-help-single {
+ margin: 0 8px 20px;
+}
+
+.mce-window .wp-editor-help table.fixed {
+ table-layout: fixed;
+}
+
+.mce-window .wp-editor-help table.fixed th:nth-child(odd),
+.mce-window .wp-editor-help table.fixed td:nth-child(odd) {
+ width: 12%;
+}
+
+.mce-window .wp-editor-help table.fixed th:nth-child(even),
+.mce-window .wp-editor-help table.fixed td:nth-child(even) {
+ width: 38%;
+}
+
+.mce-window .wp-editor-help table.fixed th:nth-child(odd) {
+ padding: 5px 0 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .mce-window .wp-editor-help td,
</span><span class="cx" style="display: block; padding: 0 10px"> .mce-window .wp-editor-help th {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 13px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,11 +181,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background: rgba(0,0,0,0.08);
</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">-.mce-window .wp-help-header td {
- font-weight: bold;
- padding: 0 5px;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .mce-window .wp-help-th-center td:nth-child(odd),
</span><span class="cx" style="display: block; padding: 0 10px"> .mce-window .wp-help-th-center th:nth-child(odd) {
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: center;
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswordpresspluginjs"></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/wordpress/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/wordpress/plugin.js 2016-02-28 18:35:25 UTC (rev 36760)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2016-02-28 18:59:25 UTC (rev 36761)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,43 +262,51 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Main section, default and additional shortcuts
</span><span class="cx" style="display: block; padding: 0 10px"> html = html +
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' + __( 'Default shortcuts,' ) + ' ' + meta + '</h2>' +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<table class="wp-help-th-center">' +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<table class="wp-help-th-center fixed">' +
</ins><span class="cx" style="display: block; padding: 0 10px"> header +
</span><span class="cx" style="display: block; padding: 0 10px"> table1.join('') +
</span><span class="cx" style="display: block; padding: 0 10px"> '</table>' +
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' + __( 'Additional shortcuts,' ) + ' ' + access + '</h2>' +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<table class="wp-help-th-center">' +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<table class="wp-help-th-center fixed">' +
</ins><span class="cx" style="display: block; padding: 0 10px"> header +
</span><span class="cx" style="display: block; padding: 0 10px"> table2.join('') +
</span><span class="cx" style="display: block; padding: 0 10px"> '</table>';
</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 ( editor.plugins.wptextpattern ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( editor.plugins.wptextpattern && ( ! tinymce.Env.ie || tinymce.Env.ie > 8 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Text pattern section
</span><span class="cx" style="display: block; padding: 0 10px"> html = html +
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' + __( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ) + '</h2>' +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<table>' +
- tr({ '*': 'Bullet list' }) +
- tr({ '-': 'Bullet list' }) +
- tr({ '1.': 'Numbered list' }) +
- tr({ '1)': 'Numbered list' }) +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<table class="wp-help-th-center fixed">' +
+ tr({ '*': 'Bullet list', '1.': 'Numbered list' }) +
+ tr({ '-': 'Bullet list', '1)': 'Numbered list' }) +
</ins><span class="cx" style="display: block; padding: 0 10px"> '</table>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> html = html +
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' + __( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ) + '</h2>' +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<table>' +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<table class="wp-help-single">' +
</ins><span class="cx" style="display: block; padding: 0 10px"> tr({ '>': 'Blockquote' }) +
</span><span class="cx" style="display: block; padding: 0 10px"> tr({ '##': 'Heading 2' }) +
</span><span class="cx" style="display: block; padding: 0 10px"> tr({ '###': 'Heading 3' }) +
</span><span class="cx" style="display: block; padding: 0 10px"> tr({ '####': 'Heading 4' }) +
</span><span class="cx" style="display: block; padding: 0 10px"> tr({ '#####': 'Heading 5' }) +
</span><span class="cx" style="display: block; padding: 0 10px"> tr({ '######': 'Heading 6' }) +
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ tr({ '---': 'Horizontal rule' }) +
+ tr({ '***': 'Horizontal rule' }) +
</ins><span class="cx" style="display: block; padding: 0 10px"> '</table>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ html = html +
+ '<h2>' + __( 'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' ) + '</h2>' +
+ '<table class="wp-help-th-center fixed">' +
+ tr({ '*': 'Italic', '**': 'Bold' }) +
+ tr({ '_': 'Italic', '__': 'Bold' }) +
+ tr({ '`': 'Code', empty: '' }) +
+ '</table>';
</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"> // Focus management section
</span><span class="cx" style="display: block; padding: 0 10px"> html = html +
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' + __( 'Focus shortcuts:' ) + '</h2>' +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<table>' +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<table class="wp-help-single">' +
</ins><span class="cx" style="display: block; padding: 0 10px"> tr({ 'Alt + F8': 'Inline toolbar (when an image, link or preview is selected)' }) +
</span><span class="cx" style="display: block; padding: 0 10px"> tr({ 'Alt + F9': 'Editor menu (when enabled)' }) +
</span><span class="cx" style="display: block; padding: 0 10px"> tr({ 'Alt + F10': 'Editor toolbar' }) +
</span></span></pre></div>
<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-28 18:35:25 UTC (rev 36760)
+++ trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js 2016-02-28 18:59:25 UTC (rev 36761)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * using the undo shortcut, or the undo button in the toolbar.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( tinymce, setTimeout ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( tinymce.Env.ie && tinymce.Env.ie < 9 ) {
+ return;
+ }
+
</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><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +86,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( node.nodeType !== 3 || ! node.data.length || ! offset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! node || node.nodeType !== 3 || ! node.data.length || ! offset ) {
</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>
</div>
</body>
</html>