<!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>[17974] trunk/wp-includes/js/tinymce/wp-mce-help.php: When viewing Help in DFW, show only the shortcuts tab, see #17136</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://trac.wordpress.org/changeset/17974">17974</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-05-19 18:49:36 +0000 (Thu, 19 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>When viewing Help in DFW, show only the shortcuts tab, see <a href="http://trac.wordpress.org/ticket/17136">#17136</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpincludesjstinymcewpmcehelpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/wp-mce-help.php (17973 => 17974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-mce-help.php        2011-05-19 17:43:19 UTC (rev 17973)
+++ trunk/wp-includes/js/tinymce/wp-mce-help.php        2011-05-19 18:49:36 UTC (rev 17974)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
</span><span class="cx"> <title><?php _e('Rich Editor Help') ?></title>
</span><del>-<script type="text/javascript" src="tiny_mce_popup.js?ver=3223"></script>
</del><ins>+<script type="text/javascript" src="tiny_mce_popup.js?ver=342"></script>
</ins><span class="cx"> <?php
</span><span class="cx"> wp_admin_css( 'global', true );
</span><span class="cx"> wp_admin_css( 'wp-admin', true );
</span><span class="lines">@@ -127,6 +127,20 @@
</span><span class="cx">         #buttoncontainer a, #buttoncontainer a:hover {
</span><span class="cx">                 border-bottom: 0px;
</span><span class="cx">         }
</span><ins>+
+        .mac,
+        .macos .win {
+                display: none;
+        }
+
+        .macos span.mac {
+                display: inline;
+        }
+
+        .macwebkit tr.mac {
+                display: table-row;
+        }
+        
</ins><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,11 +173,25 @@
</span><span class="cx">                 }
</span><span class="cx">         }
</span><span class="cx">
</span><del>- function init() {
- document.getElementById('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
</del><ins>+ tinyMCEPopup.onInit.add(function() {
+ var win = tinyMCEPopup.getWin();
+
+                document.getElementById('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
</ins><span class="cx"> document.getElementById('date').innerHTML = tinymce.releaseDate;
</span><del>- }
- tinyMCEPopup.onInit.add(init);
</del><ins>+
+                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';
+
+ });
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="lines">@@ -200,28 +228,33 @@
</span><span class="cx"> <div id="content3" class="hidden">
</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><ins>+        <p class="dfw-extra"><?php
+
+        printf( __('In Distraction free writing mode use %1$s to make the editor wider, %2$s to make it narrower and %3$s to reset it to the original theme width.'),
+                '<span class="win">Alt +</span><span class="mac">Ctrl +</span>',
+                '<span class="win">Alt -</span><span class="mac">Ctrl -</span>',
+                '<span class="win">Alt 0</span><span class="mac">Ctrl 0</span>'
+        );
+
+        ?></p>
</ins><span class="cx">         <table class="keys" width="100%" style="border: 0 none;">
</span><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><del>-                <script type="text/javascript">
-                if ( ! tinymce.isWebKit )
-                        document.write("<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>")
-                </script>
</del><ins>+                
+                <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>
</ins><span class="cx">         </table>
</span><span class="cx">
</span><span class="cx">         <p><?php _e('The following shortcuts use different access keys: Alt + Shift + letter.') ?></p>
</span><span class="cx">         <table class="keys" width="100%" style="border: 0 none;">
</span><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>-                <script type="text/javascript">
-                if ( tinymce.isWebKit )
-                        document.write("<tr><th>b</th><td><?php _e('Bold') ?></td><th>i</th><td><?php _e('Italic') ?></td></tr>")
-                </script>
</del><ins>+                <tr class="mac"><th>b</th><td><?php _e('Bold') ?></td><th>i</th><td><?php _e('Italic') ?></td></tr>
+
</ins><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></pre>
</div>
</div>
</body>
</html>