<!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>[32059] trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js: TinyMCE: fix our shortcuts on Mac, use Ctrl + Opt + letter.</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/32059">32059</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/32059","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>2015-04-06 22:50:28 +0000 (Mon, 06 Apr 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: fix our shortcuts on Mac, use Ctrl + Opt + letter.
Props iseulde. See <a href="https://core.trac.wordpress.org/ticket/29558">#29558</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2015-04-06 20:37:38 UTC (rev 32058)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2015-04-06 22:50:28 UTC (rev 32059)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> tinymce.ui.FloatPanel.zIndex = 100100;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> tinymce.PluginManager.add( 'wordpress', function( editor ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var DOM = tinymce.DOM, wpAdvButton, modKey, style,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var DOM = tinymce.DOM,
+ each = tinymce.each,
+ __ = editor.editorManager.i18n.translate,
+ wpAdvButton, style,
</ins><span class="cx" style="display: block; padding: 0 10px"> last = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( typeof window.jQuery !== 'undefined' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> state = 'hide';
</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( toolbars, function( toolbar, i ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ each( toolbars, function( toolbar, i ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( i > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( state === 'hide' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> toolbar.hide();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( e.content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( e.content.indexOf( '<!--more' ) !== -1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- title = editor.editorManager.i18n.translate( 'Read more...' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ title = __( 'Read more...' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> e.content = e.content.replace( /<!--more(.*?)-->/g, function( match, moretext ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return '<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="more" data-wp-more-text="' + moretext + '" ' +
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +103,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"> if ( e.content.indexOf( '<!--nextpage-->' ) !== -1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- title = editor.editorManager.i18n.translate( 'Page break' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ title = __( 'Page break' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> e.content = e.content.replace( /<!--nextpage-->/g,
</span><span class="cx" style="display: block; padding: 0 10px"> '<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="nextpage" class="wp-more-tag mce-wp-nextpage" ' +
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +152,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> tag = tag || 'more';
</span><span class="cx" style="display: block; padding: 0 10px"> classname += ' mce-wp-' + tag;
</span><span class="cx" style="display: block; padding: 0 10px"> title = tag === 'more' ? 'Read more...' : 'Next page';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- title = editor.editorManager.i18n.translate( title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ title = __( title );
</ins><span class="cx" style="display: block; padding: 0 10px"> html = '<img src="' + tinymce.Env.transparentSrc + '" title="' + title + '" class="' + classname + '" ' +
</span><span class="cx" style="display: block; padding: 0 10px"> 'data-wp-more="' + tag + '" data-mce-resize="false" data-mce-placeholder="1" />';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,7 +312,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> bodyClass.push('wp-editor');
</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( bodyClass, function( cls ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ each( bodyClass, function( cls ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( cls ) {
</span><span class="cx" style="display: block; padding: 0 10px"> dom.addClass( doc.body, cls );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'PastePostProcess', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove empty paragraphs
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tinymce.each( dom.select( 'p', event.node ), function( node ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ each( dom.select( 'p', event.node ), function( node ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( dom.isEmpty( node ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> dom.remove( node );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,41 +411,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( tinymce.Env.iOS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> editor.settings.height = 300;
</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">- // Add custom shortcuts
- modKey = 'alt+shift';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ each( {
+ c: 'JustifyCenter',
+ r: 'JustifyRight',
+ l: 'JustifyLeft',
+ j: 'JustifyFull',
+ q: 'mceBlockQuote',
+ u: 'InsertUnorderedList',
+ o: 'InsertOrderedList',
+ s: 'unlink',
+ m: 'WP_Medialib',
+ z: 'WP_Adv',
+ t: 'WP_More',
+ d: 'Strikethrough',
+ h: 'WP_Help',
+ p: 'WP_Page',
+ x: 'WP_Code'
+ }, function( command, key ) {
+ editor.shortcuts.add( 'access+' + key, '', command );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editor.addShortcut( modKey + '+c', '', 'JustifyCenter' );
- editor.addShortcut( modKey + '+r', '', 'JustifyRight' );
- editor.addShortcut( modKey + '+l', '', 'JustifyLeft' );
- editor.addShortcut( modKey + '+j', '', 'JustifyFull' );
- editor.addShortcut( modKey + '+q', '', 'mceBlockQuote' );
- editor.addShortcut( modKey + '+u', '', 'InsertUnorderedList' );
- editor.addShortcut( modKey + '+o', '', 'InsertOrderedList' );
- editor.addShortcut( modKey + '+n', '', 'mceSpellCheck' );
- editor.addShortcut( modKey + '+s', '', 'unlink' );
- editor.addShortcut( modKey + '+m', '', 'WP_Medialib' );
- editor.addShortcut( modKey + '+z', '', 'WP_Adv' );
- editor.addShortcut( modKey + '+t', '', 'WP_More' );
- editor.addShortcut( modKey + '+d', '', 'Strikethrough' );
- editor.addShortcut( modKey + '+h', '', 'WP_Help' );
- editor.addShortcut( modKey + '+p', '', 'WP_Page' );
- editor.addShortcut( modKey + '+x', '', 'WP_Code' );
- editor.addShortcut( 'ctrl+s', '', function() {
- if ( typeof wp !== 'undefined' && wp.autosave ) {
- wp.autosave.server.triggerSave();
- }
- });
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.addShortcut( 'ctrl+s', '', function() {
+ if ( typeof wp !== 'undefined' && wp.autosave ) {
+ wp.autosave.server.triggerSave();
+ }
+ } );
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Experimental: create a floating toolbar.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This functionality will change in the next releases. Not recommennded for use by plugins.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This functionality will change in the next releases. Not recommended for use by plugins.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> ( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var DOM = tinymce.DOM,
- each = tinymce.each,
- Factory = tinymce.ui.Factory,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var Factory = tinymce.ui.Factory,
</ins><span class="cx" style="display: block; padding: 0 10px"> settings = editor.settings,
</span><span class="cx" style="display: block; padding: 0 10px"> currentToolbar,
</span><span class="cx" style="display: block; padding: 0 10px"> currentSelection;
</span></span></pre>
</div>
</div>
</body>
</html>