<!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>[21266] trunk/wp-includes/js/tinymce: TinyMCE: update the keyboard shortcuts: Alt + letter for Firefox and WebKit, Alt + Shift + letter for IE and Opera, add shortcut for DFW (Alt + W), see #21214, fixes #21197, fixes #17992</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21266">21266</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2012-07-13 00:26:49 +0000 (Fri, 13 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE: update the keyboard shortcuts: Alt + letter for Firefox and WebKit, Alt + Shift + letter for IE and Opera, add shortcut for DFW (Alt + W), see <a href="http://core.trac.wordpress.org/ticket/21214">#21214</a>, fixes <a href="http://core.trac.wordpress.org/ticket/21197">#21197</a>, fixes <a href="http://core.trac.wordpress.org/ticket/17992">#17992</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcelangswplangsenjs">trunk/wp-includes/js/tinymce/langs/wp-langs-en.js</a></li>
<li><a href="#trunkwpincludesjstinymcelangswplangsphp">trunk/wp-includes/js/tinymce/langs/wp-langs.php</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswordpresseditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpfullscreeneditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswplinkeditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js</a></li>
<li><a href="#trunkwpincludesjstinymcewpmcehelpphp">trunk/wp-includes/js/tinymce/wp-mce-help.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcelangswplangsenjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/langs/wp-langs-en.js (21265 => 21266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/langs/wp-langs-en.js 2012-07-13 00:17:05 UTC (rev 21265)
+++ trunk/wp-includes/js/tinymce/langs/wp-langs-en.js 2012-07-13 00:26:49 UTC (rev 21266)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> unload_msg:"The changes you made will be lost if you navigate away from this page."
</span><span class="cx"> },
</span><span class="cx"> fullscreen:{
</span><del>-desc:"Toggle fullscreen mode (Alt + Shift + G)"
</del><ins>+desc:"Toggle fullscreen mode (Alt + G)"
</ins><span class="cx"> },
</span><span class="cx"> media:{
</span><span class="cx"> desc:"Insert / edit embedded media",
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> desc:"Visual control characters on/off."
</span><span class="cx"> },
</span><span class="cx"> spellchecker:{
</span><del>-desc:"Toggle spellchecker (Alt + Shift + N)",
</del><ins>+desc:"Toggle spellchecker (Alt + N)",
</ins><span class="cx"> menu:"Spellchecker settings",
</span><span class="cx"> ignore_word:"Ignore word",
</span><span class="cx"> ignore_words:"Ignore all",
</span><span class="lines">@@ -243,20 +243,20 @@
</span><span class="cx"> bold_desc:"Bold (Ctrl + B)",
</span><span class="cx"> italic_desc:"Italic (Ctrl + I)",
</span><span class="cx"> underline_desc:"Underline",
</span><del>-striketrough_desc:"Strikethrough (Alt + Shift + D)",
-justifyleft_desc:"Align Left (Alt + Shift + L)",
-justifycenter_desc:"Align Center (Alt + Shift + C)",
-justifyright_desc:"Align Right (Alt + Shift + R)",
-justifyfull_desc:"Align Full (Alt + Shift + J)",
-bullist_desc:"Unordered list (Alt + Shift + U)",
-numlist_desc:"Ordered list (Alt + Shift + O)",
</del><ins>+striketrough_desc:"Strikethrough (Alt + D)",
+justifyleft_desc:"Align Left (Alt + L)",
+justifycenter_desc:"Align Center (Alt + C)",
+justifyright_desc:"Align Right (Alt + R)",
+justifyfull_desc:"Align Full (Alt + J)",
+bullist_desc:"Unordered list (Alt + U)",
+numlist_desc:"Ordered list (Alt + O)",
</ins><span class="cx"> outdent_desc:"Outdent",
</span><span class="cx"> indent_desc:"Indent",
</span><span class="cx"> undo_desc:"Undo (Ctrl + Z)",
</span><span class="cx"> redo_desc:"Redo (Ctrl + Y)",
</span><del>-link_desc:"Insert/edit link (Alt + Shift + A)",
-unlink_desc:"Unlink (Alt + Shift + S)",
-image_desc:"Insert/edit image (Alt + Shift + M)",
</del><ins>+link_desc:"Insert/edit link (Alt + A)",
+unlink_desc:"Unlink (Alt + S)",
+image_desc:"Insert/edit image (Alt + M)",
</ins><span class="cx"> cleanup_desc:"Cleanup messy code",
</span><span class="cx"> code_desc:"Edit HTML Source",
</span><span class="cx"> sub_desc:"Subscript",
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> image_props_desc:"Image properties",
</span><span class="cx"> newdocument_desc:"New document",
</span><span class="cx"> help_desc:"Help",
</span><del>-blockquote_desc:"Blockquote (Alt + Shift + Q)",
</del><ins>+blockquote_desc:"Blockquote (Alt + Q)",
</ins><span class="cx"> clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.",
</span><span class="cx"> path:"Path",
</span><span class="cx"> newdocument:"Are you sure you want to clear all contents?",
</span><span class="lines">@@ -452,10 +452,10 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> tinyMCE.addI18n("en.wordpress",{
</span><del>-wp_adv_desc:"Show/Hide Kitchen Sink (Alt + Shift + Z)",
-wp_more_desc:"Insert More Tag (Alt + Shift + T)",
-wp_page_desc:"Insert Page break (Alt + Shift + P)",
-wp_help_desc:"Help (Alt + Shift + H)",
</del><ins>+wp_adv_desc:"Show/Hide Kitchen Sink (Alt + Z)",
+wp_more_desc:"Insert More Tag (Alt + T)",
+wp_page_desc:"Insert Page break (Alt + P)",
+wp_help_desc:"Help (Alt + H)",
</ins><span class="cx"> wp_more_alt:"More...",
</span><span class="cx"> wp_page_alt:"Next page...",
</span><span class="cx"> add_media:"Add Media",
</span><span class="lines">@@ -463,7 +463,8 @@
</span><span class="cx"> add_video:"Add Video",
</span><span class="cx"> add_audio:"Add Audio",
</span><span class="cx"> editgallery:"Edit Gallery",
</span><del>-delgallery:"Delete Gallery"
</del><ins>+delgallery:"Delete Gallery",
+wp_fullscreen_desc:"Distraction Free Writing mode (Alt + W)"
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> tinyMCE.addI18n("en.wpeditimage",{
</span></span></pre></div>
<a id="trunkwpincludesjstinymcelangswplangsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/langs/wp-langs.php (21265 => 21266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/langs/wp-langs.php 2012-07-13 00:17:05 UTC (rev 21265)
+++ trunk/wp-includes/js/tinymce/langs/wp-langs.php 2012-07-13 00:26:49 UTC (rev 21266)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> ),
</span><span class="cx">
</span><span class="cx"> 'fullscreen' => array(
</span><del>- 'desc' => __('Toggle fullscreen mode (Alt + Shift + G)')
</del><ins>+ 'desc' => __('Toggle fullscreen mode (Alt + G)')
</ins><span class="cx"> ),
</span><span class="cx">
</span><span class="cx"> 'media' => array(
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> ),
</span><span class="cx">
</span><span class="cx"> 'spellchecker' => array(
</span><del>- 'desc' => __('Toggle spellchecker (Alt + Shift + N)'),
</del><ins>+ 'desc' => __('Toggle spellchecker (Alt + N)'),
</ins><span class="cx"> 'menu' => __('Spellchecker settings'),
</span><span class="cx"> 'ignore_word' => __('Ignore word'),
</span><span class="cx"> 'ignore_words' => __('Ignore all'),
</span><span class="lines">@@ -286,20 +286,20 @@
</span><span class="cx"> 'bold_desc' => __('Bold (Ctrl + B)'),
</span><span class="cx"> 'italic_desc' => __('Italic (Ctrl + I)'),
</span><span class="cx"> 'underline_desc' => __('Underline'),
</span><del>- 'striketrough_desc' => __('Strikethrough (Alt + Shift + D)'),
- 'justifyleft_desc' => __('Align Left (Alt + Shift + L)'),
- 'justifycenter_desc' => __('Align Center (Alt + Shift + C)'),
- 'justifyright_desc' => __('Align Right (Alt + Shift + R)'),
- 'justifyfull_desc' => __('Align Full (Alt + Shift + J)'),
- 'bullist_desc' => __('Unordered list (Alt + Shift + U)'),
- 'numlist_desc' => __('Ordered list (Alt + Shift + O)'),
</del><ins>+ 'striketrough_desc' => __('Strikethrough (Alt + D)'),
+ 'justifyleft_desc' => __('Align Left (Alt + L)'),
+ 'justifycenter_desc' => __('Align Center (Alt + C)'),
+ 'justifyright_desc' => __('Align Right (Alt + R)'),
+ 'justifyfull_desc' => __('Align Full (Alt + J)'),
+ 'bullist_desc' => __('Unordered list (Alt + U)'),
+ 'numlist_desc' => __('Ordered list (Alt + O)'),
</ins><span class="cx"> 'outdent_desc' => __('Outdent'),
</span><span class="cx"> 'indent_desc' => __('Indent'),
</span><span class="cx"> 'undo_desc' => __('Undo (Ctrl + Z)'),
</span><span class="cx"> 'redo_desc' => __('Redo (Ctrl + Y)'),
</span><del>- 'link_desc' => __('Insert/edit link (Alt + Shift + A)'),
- 'unlink_desc' => __('Unlink (Alt + Shift + S)'),
- 'image_desc' => __('Insert/edit image (Alt + Shift + M)'),
</del><ins>+ 'link_desc' => __('Insert/edit link (Alt + A)'),
+ 'unlink_desc' => __('Unlink (Alt + S)'),
+ 'image_desc' => __('Insert/edit image (Alt + M)'),
</ins><span class="cx"> 'cleanup_desc' => __('Cleanup messy code'),
</span><span class="cx"> 'code_desc' => __('Edit HTML Source'),
</span><span class="cx"> 'sub_desc' => __('Subscript'),
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> 'image_props_desc' => __('Image properties'),
</span><span class="cx"> 'newdocument_desc' => __('New document'),
</span><span class="cx"> 'help_desc' => __('Help'),
</span><del>- 'blockquote_desc' => __('Blockquote (Alt + Shift + Q)'),
</del><ins>+ 'blockquote_desc' => __('Blockquote (Alt + Q)'),
</ins><span class="cx"> 'clipboard_msg' => __('Copy/Cut/Paste is not available in Mozilla and Firefox.'),
</span><span class="cx"> 'path' => __('Path'),
</span><span class="cx"> 'newdocument' => __('Are you sure you want to clear all contents?'),
</span><span class="lines">@@ -495,10 +495,10 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $wordpress = array(
</span><del>- 'wp_adv_desc' => __('Show/Hide Kitchen Sink (Alt + Shift + Z)'),
- 'wp_more_desc' => __('Insert More Tag (Alt + Shift + T)'),
- 'wp_page_desc' => __('Insert Page break (Alt + Shift + P)'),
- 'wp_help_desc' => __('Help (Alt + Shift + H)'),
</del><ins>+ 'wp_adv_desc' => __('Show/Hide Kitchen Sink (Alt + Z)'),
+ 'wp_more_desc' => __('Insert More Tag (Alt + T)'),
+ 'wp_page_desc' => __('Insert Page break (Alt + P)'),
+ 'wp_help_desc' => __('Help (Alt + H)'),
</ins><span class="cx"> 'wp_more_alt' => __('More...'),
</span><span class="cx"> 'wp_page_alt' => __('Next page...'),
</span><span class="cx"> 'add_media' => __('Add Media'),
</span><span class="lines">@@ -506,7 +506,8 @@
</span><span class="cx"> 'add_video' => __('Add Video'),
</span><span class="cx"> 'add_audio' => __('Add Audio'),
</span><span class="cx"> 'editgallery' => __('Edit Gallery'),
</span><del>- 'delgallery' => __('Delete Gallery')
</del><ins>+ 'delgallery' => __('Delete Gallery'),
+ 'wp_fullscreen_desc' => __('Distraction Free Writing mode (Alt + W)')
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $wpeditimage = array(
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswordpresseditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js (21265 => 21266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js 2012-07-13 00:17:05 UTC (rev 21265)
+++ trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js 2012-07-13 00:26:49 UTC (rev 21266)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> mceTout : 0,
</span><span class="cx">
</span><span class="cx"> init : function(ed, url) {
</span><del>- var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML, closeOnClick;
</del><ins>+ var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML, closeOnClick, mod_key;
</ins><span class="cx"> moreHTML = '<img src="' + url + '/img/trans.gif" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
</span><span class="cx"> nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
</span><span class="cx">
</span><span class="lines">@@ -74,7 +74,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> tb_show('', link.href);
</span><del>- tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
</del><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Register buttons
</span><span class="lines">@@ -250,30 +249,32 @@
</span><span class="cx"> t._handleMoreBreak(ed, url);
</span><span class="cx">
</span><span class="cx"> // Add custom shortcuts
</span><del>- ed.addShortcut('alt+shift+c', ed.getLang('justifycenter_desc'), 'JustifyCenter');
- ed.addShortcut('alt+shift+r', ed.getLang('justifyright_desc'), 'JustifyRight');
- ed.addShortcut('alt+shift+l', ed.getLang('justifyleft_desc'), 'JustifyLeft');
- ed.addShortcut('alt+shift+j', ed.getLang('justifyfull_desc'), 'JustifyFull');
- ed.addShortcut('alt+shift+q', ed.getLang('blockquote_desc'), 'mceBlockQuote');
- ed.addShortcut('alt+shift+u', ed.getLang('bullist_desc'), 'InsertUnorderedList');
- ed.addShortcut('alt+shift+o', ed.getLang('numlist_desc'), 'InsertOrderedList');
- ed.addShortcut('alt+shift+d', ed.getLang('striketrough_desc'), 'Strikethrough');
- ed.addShortcut('alt+shift+n', ed.getLang('spellchecker.desc'), 'mceSpellCheck');
- ed.addShortcut('alt+shift+a', ed.getLang('link_desc'), 'mceLink');
- ed.addShortcut('alt+shift+s', ed.getLang('unlink_desc'), 'unlink');
- ed.addShortcut('alt+shift+m', ed.getLang('image_desc'), 'WP_Medialib');
- ed.addShortcut('alt+shift+g', ed.getLang('fullscreen.desc'), 'mceFullScreen');
- ed.addShortcut('alt+shift+z', ed.getLang('wp_adv_desc'), 'WP_Adv');
- ed.addShortcut('alt+shift+h', ed.getLang('help_desc'), 'WP_Help');
- ed.addShortcut('alt+shift+t', ed.getLang('wp_more_desc'), 'WP_More');
- ed.addShortcut('alt+shift+p', ed.getLang('wp_page_desc'), 'WP_Page');
- ed.addShortcut('ctrl+s', ed.getLang('save_desc'), function(){if('function'==typeof autosave)autosave();});
</del><ins>+ mod_key = 'alt';
</ins><span class="cx">
</span><del>- if ( tinymce.isWebKit ) {
- ed.addShortcut('alt+shift+b', ed.getLang('bold_desc'), 'Bold');
- ed.addShortcut('alt+shift+i', ed.getLang('italic_desc'), 'Italic');
- }
</del><ins>+ if ( tinymce.isIE || tinymce.isOpera )
+ mod_key = 'shift+alt';
</ins><span class="cx">
</span><ins>+ ed.addShortcut(mod_key + '+c', 'justifycenter_desc', 'JustifyCenter');
+ ed.addShortcut(mod_key + '+r', 'justifyright_desc', 'JustifyRight');
+ ed.addShortcut(mod_key + '+l', 'justifyleft_desc', 'JustifyLeft');
+ ed.addShortcut(mod_key + '+j', 'justifyfull_desc', 'JustifyFull');
+ ed.addShortcut(mod_key + '+q', 'blockquote_desc', 'mceBlockQuote');
+ ed.addShortcut(mod_key + '+u', 'bullist_desc', 'InsertUnorderedList');
+ ed.addShortcut(mod_key + '+o', 'numlist_desc', 'InsertOrderedList');
+ ed.addShortcut(mod_key + '+n', 'spellchecker.desc', 'mceSpellCheck');
+ ed.addShortcut(mod_key + '+a', 'link_desc', 'WP_Link');
+ ed.addShortcut(mod_key + '+s', 'unlink_desc', 'unlink');
+ ed.addShortcut(mod_key + '+m', 'image_desc', 'WP_Medialib');
+ ed.addShortcut(mod_key + '+z', 'wordpress.wp_adv_desc', 'WP_Adv');
+ ed.addShortcut(mod_key + '+t', 'wordpress.wp_more_desc', 'WP_More');
+ ed.addShortcut(mod_key + '+d', 'striketrough_desc', 'Strikethrough');
+ ed.addShortcut(mod_key + '+h', 'help_desc', 'WP_Help');
+ ed.addShortcut(mod_key + '+p', 'wordpress.wp_page_desc', 'WP_Page');
+ ed.addShortcut(mod_key + '+w', 'wordpress.wp_fullscreen_desc', 'wpFullScreen');
+ ed.addShortcut(mod_key + '+g', 'fullscreen.desc', 'mceFullScreen');
+ ed.addShortcut('ctrl+s', 'save_desc', function(){if('function'==typeof autosave)autosave();});
+
+ // popup buttons for images and the gallery
</ins><span class="cx"> ed.onInit.add(function(ed) {
</span><span class="cx"> tinymce.dom.Event.add(ed.getWin(), 'scroll', function(e) {
</span><span class="cx"> ed.plugins.wordpress._hideButtons();
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpfullscreeneditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js (21265 => 21266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js 2012-07-13 00:17:05 UTC (rev 21265)
+++ trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js 2012-07-13 00:26:49 UTC (rev 21266)
</span><span class="lines">@@ -93,13 +93,21 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ ed.addCommand('wpFullScreen', function() {
+ if ( typeof(fullscreen) == 'undefined' )
+ return;
+
+ if ( 'wp_mce_fullscreen' == ed.id )
+ fullscreen.off();
+ else
+ fullscreen.on();
+ });
+
</ins><span class="cx"> // Register buttons
</span><del>- if ( 'undefined' != fullscreen ) {
- ed.addButton('wp_fullscreen', {
- title : 'fullscreen.desc',
- onclick : function(){ fullscreen.on(); }
- });
- }
</del><ins>+ ed.addButton('wp_fullscreen', {
+ title : 'wordpress.wp_fullscreen_desc',
+ cmd : 'wpFullScreen'
+ });
</ins><span class="cx">
</span><span class="cx"> // END fullscreen
</span><span class="cx"> //----------------------------------------------------------------
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswplinkeditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js (21265 => 21266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js 2012-07-13 00:17:05 UTC (rev 21265)
+++ trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js 2012-07-13 00:26:49 UTC (rev 21266)
</span><span class="lines">@@ -28,12 +28,10 @@
</span><span class="cx">
</span><span class="cx"> // Register example button
</span><span class="cx"> ed.addButton('link', {
</span><del>- title : ed.getLang('advanced.link_desc'),
</del><ins>+ title : 'advanced.link_desc',
</ins><span class="cx"> cmd : 'WP_Link'
</span><span class="cx"> });
</span><span class="cx">
</span><del>- ed.addShortcut('alt+shift+a', ed.getLang('advanced.link_desc'), 'WP_Link');
-
</del><span class="cx"> ed.onNodeChange.add(function(ed, cm, n, co) {
</span><span class="cx"> disabled = co && n.nodeName != 'A';
</span><span class="cx"> });
</span><span class="lines">@@ -57,4 +55,5 @@
</span><span class="cx">
</span><span class="cx"> // Register plugin
</span><span class="cx"> tinymce.PluginManager.add('wplink', tinymce.plugins.wpLink);
</span><del>-})();
</del><span class="cx">\ No newline at end of file
</span><ins>+})();
+
</ins></span></pre></div>
<a id="trunkwpincludesjstinymcewpmcehelpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/wp-mce-help.php (21265 => 21266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-mce-help.php 2012-07-13 00:17:05 UTC (rev 21265)
+++ trunk/wp-includes/js/tinymce/wp-mce-help.php 2012-07-13 00:26:49 UTC (rev 21266)
</span><span class="lines">@@ -111,6 +111,8 @@
</span><span class="cx"> }
</span><span class="cx"> .keys {
</span><span class="cx"> margin-bottom: 15px;
</span><ins>+ width: 100%;
+ border: 0 none;
</ins><span class="cx"> }
</span><span class="cx"> .keys p {
</span><span class="cx"> display: inline-block;
</span><span class="lines">@@ -130,20 +132,10 @@
</span><span class="cx"> #buttoncontainer a, #buttoncontainer a:hover {
</span><span class="cx"> border-bottom: 0px;
</span><span class="cx"> }
</span><del>-
- .mac,
- .macos .win {
</del><ins>+ .macos .win,
+ .windows .mac {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><del>-
- .macos span.mac {
- display: inline;
- }
-
- .macwebkit tr.mac {
- display: table-row;
- }
-
</del><span class="cx"> </style>
</span><span class="cx"> <?php if ( is_rtl() ) : ?>
</span><span class="cx"> <style type="text/css">
</span><span class="lines">@@ -159,45 +151,12 @@
</span><span class="cx"> td b { font-family: Tahoma, "Times New Roman", Times, serif }
</span><span class="cx"> </style>
</span><span class="cx"> <?php endif; ?>
</span><ins>+</head>
+<body class="windows">
</ins><span class="cx"> <script type="text/javascript">
</span><del>- function d(id) { return document.getElementById(id); }
-
- function flipTab(n) {
- for (i=1;i<=4;i++) {
- c = d('content'+i.toString());
- t = d('tab'+i.toString());
- if ( n == i ) {
- c.className = '';
- t.className = 'current';
- } else {
- c.className = 'hidden';
- t.className = '';
- }
- }
- }
-
- tinyMCEPopup.onInit.add(function() {
- var win = tinyMCEPopup.getWin();
-
- document.getElementById('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
- document.getElementById('date').innerHTML = tinymce.releaseDate;
-
- if ( win.fullscreen && win.fullscreen.settings.visible ) {
- d('content1').className = 'hidden';
- d('tabs').className = 'hidden';
- d('content3').className = 'dfw';
- }
-
- if ( tinymce.isMac )
- document.body.className = 'macos';
-
- if ( tinymce.isMac && tinymce.isWebKit )
- document.body.className = 'macos macwebkit';
-
- });
</del><ins>+if ( tinymce.isMac )
+ document.body.className = document.body.className.replace(/windows/, 'macos');
</ins><span class="cx"> </script>
</span><del>-</head>
-<body>
</del><span class="cx">
</span><span class="cx"> <ul id="tabs">
</span><span class="cx"> <li><a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing') ?>" accesskey="1" tabindex="1" class="current"><?php _e('Basics') ?></a></li>
</span><span class="lines">@@ -232,24 +191,22 @@
</span><span class="cx"> <h2><?php _e('Writing at Full Speed') ?></h2>
</span><span class="cx"> <p><?php _e('Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Ctrl + letter. Macintosh uses Command + letter.') ?></p>
</span><span class="cx">
</span><del>- <table class="keys" width="100%" style="border: 0 none;">
</del><ins>+ <table class="keys">
</ins><span class="cx"> <tr class="top"><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th></tr>
</span><span class="cx"> <tr><th>c</th><td><?php _e('Copy') ?></td><th>v</th><td><?php _e('Paste') ?></td></tr>
</span><span class="cx"> <tr><th>a</th><td><?php _e('Select all') ?></td><th>x</th><td><?php _e('Cut') ?></td></tr>
</span><span class="cx"> <tr><th>z</th><td><?php _e('Undo') ?></td><th>y</th><td><?php _e('Redo') ?></td></tr>
</span><span class="cx">
</span><del>- <tr class="win"><th>b</th><td><?php _e('Bold') ?></td><th>i</th><td><?php _e('Italic') ?></td></tr>
- <tr class="win"><th>u</th><td><?php _e('Underline') ?></td><th>1</th><td><?php _e('Heading 1') ?></td></tr>
- <tr class="win"><th>2</th><td><?php _e('Heading 2') ?></td><th>3</th><td><?php _e('Heading 3') ?></td></tr>
- <tr class="win"><th>4</th><td><?php _e('Heading 4') ?></td><th>5</th><td><?php _e('Heading 5') ?></td></tr>
- <tr class="win"><th>6</th><td><?php _e('Heading 6') ?></td><th>9</th><td><?php _e('Address') ?></td></tr>
</del><ins>+ <tr><th>b</th><td><?php _e('Bold') ?></td><th>i</th><td><?php _e('Italic') ?></td></tr>
+ <tr><th>u</th><td><?php _e('Underline') ?></td><th>1</th><td><?php _e('Heading 1') ?></td></tr>
+ <tr><th>2</th><td><?php _e('Heading 2') ?></td><th>3</th><td><?php _e('Heading 3') ?></td></tr>
+ <tr><th>4</th><td><?php _e('Heading 4') ?></td><th>5</th><td><?php _e('Heading 5') ?></td></tr>
+ <tr><th>6</th><td><?php _e('Heading 6') ?></td><th>9</th><td><?php _e('Address') ?></td></tr>
</ins><span class="cx"> </table>
</span><span class="cx">
</span><del>- <p><?php _e('The following shortcuts use different access keys: Alt + Shift + letter.') ?></p>
- <table class="keys" width="100%" style="border: 0 none;">
</del><ins>+ <p><?php _e('The following shortcuts use different access keys: Alt + letter in Firefox, Chrome and Safari, Alt + Shift + letter in Internet Explorer and Opera.') ?></p>
+ <table class="keys">
</ins><span class="cx"> <tr class="top"><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th></tr>
</span><del>- <tr class="mac"><th>b</th><td><?php _e('Bold') ?></td><th>i</th><td><?php _e('Italic') ?></td></tr>
-
</del><span class="cx"> <tr><th>n</th><td><?php _e('Check Spelling') ?></td><th>l</th><td><?php _e('Align Left') ?></td></tr>
</span><span class="cx"> <tr><th>j</th><td><?php _e('Justify Text') ?></td><th>c</th><td><?php _e('Align Center') ?></td></tr>
</span><span class="cx"> <tr><th>d</th><td><span style="text-decoration: line-through;"><?php _e('Strikethrough') ?></span></td><th>r</th><td><?php _e('Align Right') ?></td></tr>
</span><span class="lines">@@ -258,9 +215,11 @@
</span><span class="cx"> <tr><th>q</th><td><?php _e('Quote') ?></td><th>m</th><td><?php _e('Insert Image') ?></td></tr>
</span><span class="cx"> <tr><th>g</th><td><?php _e('Full Screen') ?></td><th>t</th><td><?php _e('Insert More Tag') ?></td></tr>
</span><span class="cx"> <tr><th>p</th><td><?php _e('Insert Page Break tag') ?></td><th>h</th><td><?php _e('Help') ?></td></tr>
</span><del>- <tr><th>e</th><td colspan="3"><?php _e('Switch to Text mode') ?></td></tr>
</del><ins>+ <tr><th>w</th><td colspan="3"><?php _e('Distraction Free Writing mode') ?></td></tr>
+ </table>
</ins><span class="cx">
</span><del>- <tr><th colspan="4" style="font-weight: normal;padding: 15px 10px 10px;"><?php _e('Editor width in Distraction-free writing mode:'); ?></th></tr>
</del><ins>+ <p style="padding: 15px 10px 10px;"><?php _e('Editor width in Distraction Free Writing mode:'); ?></p>
+ <table class="keys">
</ins><span class="cx"> <tr><th><span class="win">Alt +</span><span class="mac">Ctrl +</span></th><td><?php _e('Wider') ?></td>
</span><span class="cx"> <th><span class="win">Alt -</span><span class="mac">Ctrl -</span></th><td><?php _e('Narrower') ?></td></tr>
</span><span class="cx"> <tr><th><span class="win">Alt 0</span><span class="mac">Ctrl 0</span></th><td><?php _e('Default width') ?></td><th></th><td></td></tr>
</span><span class="lines">@@ -273,7 +232,7 @@
</span><span class="cx"> <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
</span><span class="cx"> <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.home_url('/wp-includes/js/tinymce/license.txt').'" target="_blank" title="'.esc_attr__('GNU Library General Public Licence').'">') ?></p>
</span><span class="cx"> <p><?php _e('Copyright &copy; 2003-2011, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.') ?></p>
</span><del>- <p><?php _e('For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.') ?></p>
</del><ins>+ <p><?php _e('For more information about this software visit the <a href="http://tinymce.com" target="_blank">TinyMCE website</a>.') ?></p>
</ins><span class="cx">
</span><span class="cx"> <div id="buttoncontainer">
</span><span class="cx"> <a href="http://www.moxiecode.com" target="_blank"><img src="themes/advanced/img/gotmoxie.png" alt="<?php esc_attr_e('Got Moxie?') ?>" style="border: 0" /></a>
</span><span class="lines">@@ -287,6 +246,37 @@
</span><span class="cx"> <input type="button" id="cancel" name="cancel" value="<?php esc_attr_e('Close'); ?>" title="<?php esc_attr_e('Close'); ?>" onclick="tinyMCEPopup.close();" />
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><ins>+<script type="text/javascript">
+ function d(id) { return document.getElementById(id); }
</ins><span class="cx">
</span><ins>+ function flipTab(n) {
+ var i, c, t;
+
+ for ( i = 1; i <= 4; i++ ) {
+ c = d('content'+i.toString());
+ t = d('tab'+i.toString());
+ if ( n == i ) {
+ c.className = '';
+ t.className = 'current';
+ } else {
+ c.className = 'hidden';
+ t.className = '';
+ }
+ }
+ }
+
+ tinyMCEPopup.onInit.add(function() {
+ var win = tinyMCEPopup.getWin();
+
+ d('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
+ d('date').innerHTML = tinymce.releaseDate;
+
+ if ( win.fullscreen && win.fullscreen.settings.visible ) {
+ d('content1').className = 'hidden';
+ d('tabs').className = 'hidden';
+ d('content3').className = 'dfw';
+ }
+ });
+</script>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre>
</div>
</div>
</body>
</html>