<!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>[28032] trunk/src/wp-includes: Nuke the TinyMCE help dialog as it is duplicated by help tabs.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28032">28032</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-04-08 02:31:02 +0000 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Nuke the TinyMCE help dialog as it is duplicated by help tabs. This leaves just Keyboard Shortcuts.
fixes <a href="http://core.trac.wordpress.org/ticket/27100">#27100</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcewpmcehelpphp">trunk/src/wp-includes/js/tinymce/wp-mce-help.php</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (28031 => 28032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php 2014-04-08 01:56:42 UTC (rev 28031)
+++ trunk/src/wp-includes/class-wp-editor.php 2014-04-08 02:31:02 UTC (rev 28032)
</span><span class="lines">@@ -962,7 +962,7 @@
</span><span class="cx"> 'Format' => _x( 'Format', 'TinyMCE menu' ),
</span><span class="cx">
</span><span class="cx"> // WordPress strings
</span><del>- 'Editor Help' => __( 'Editor Help' ),
</del><ins>+ 'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),
</ins><span class="cx"> 'Toolbar Toggle' => __( 'Toolbar Toggle' ),
</span><span class="cx"> 'Insert Read More tag' => __( 'Insert Read More tag' ),
</span><span class="cx"> 'Distraction Free Writing' => __( 'Distraction Free Writing' ),
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswordpresspluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (28031 => 28032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-04-08 01:56:42 UTC (rev 28031)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-04-08 02:31:02 UTC (rev 28032)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> editor.addCommand( 'WP_Help', function() {
</span><span class="cx"> editor.windowManager.open({
</span><span class="cx"> url: tinymce.baseURL + '/wp-mce-help.php',
</span><del>- title: 'Editor Help',
</del><ins>+ title: 'Keyboard Shortcuts',
</ins><span class="cx"> width: 450,
</span><span class="cx"> height: 420,
</span><span class="cx"> inline: 1,
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> editor.addButton( 'wp_help', {
</span><del>- tooltip: 'Editor Help',
</del><ins>+ tooltip: 'Keyboard Shortcuts',
</ins><span class="cx"> cmd: 'WP_Help'
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcewpmcehelpphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/wp-mce-help.php (28031 => 28032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/wp-mce-help.php 2014-04-08 01:56:42 UTC (rev 28031)
+++ trunk/src/wp-includes/js/tinymce/wp-mce-help.php 2014-04-08 02:31:02 UTC (rev 28032)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
</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><del>-<title><?php _e('Editor Help'); ?></title>
</del><ins>+<title><?php _e('Keyboard Shortcuts'); ?></title>
</ins><span class="cx">
</span><span class="cx"> <?php wp_admin_css( 'wp-admin', true ); ?>
</span><span class="cx"> <style type="text/css">
</span><span class="lines">@@ -27,47 +27,11 @@
</span><span class="cx"> min-width: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .wp-core-ui #tabs {
- margin-top: 1px;
- padding: 0 6px;
- position: absolute;
- top: 0;
- right: 0;
- left: 0;
- height: 31px;
- z-index: 1;
- }
-
- .wp-core-ui #tabs a {
- position: relative;
- float: left;
- padding: 6px 10px;
- margin: 0;
- height: 18px;
- line-height: 18px;
- text-decoration: none;
- -webkit-transition: none;
- transition: none;
- }
-
- #tabs a.active {
- margin: -1px -1px 0;
- background: #fff;
- border: 1px solid #ddd;
- border-bottom: none;
- color: #333;
- }
-
- #tabs .active:after {
- display: none;
- }
-
- #flipper {
</del><ins>+ .wrap {
</ins><span class="cx"> background-color: #fff;
</span><span class="cx"> border-top: 1px solid #ddd;
</span><del>- height: 360px;
</del><ins>+ height: 390px;
</ins><span class="cx"> margin: 0;
</span><del>- margin-top: 30px;
</del><span class="cx"> overflow: auto;
</span><span class="cx"> padding: 10px 16px;
</span><span class="cx"> }
</span><span class="lines">@@ -138,42 +102,9 @@
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx">
</span><del>-<div id="tabs">
- <a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing'); ?>" accesskey="1" class="active"><?php _e('Basics'); ?></a>
- <a id="tab2" href="javascript:flipTab(2)" title="<?php esc_attr_e('Advanced use of the Rich Editor'); ?>" accesskey="2"><?php _e('Advanced'); ?></a>
- <a id="tab3" href="javascript:flipTab(3)" title="<?php esc_attr_e('Hotkeys'); ?>" accesskey="3"><?php _e('Hotkeys'); ?></a>
- <a id="tab4" href="javascript:flipTab(4)" title="<?php esc_attr_e('About the software'); ?>" accesskey="4"><?php _e('About'); ?></a>
-</div>
</del><ins>+<div class="wrap">
</ins><span class="cx">
</span><del>-<div id="flipper" class="wrap">
-
-<div id="content1">
- <h2><?php _e('Rich Editing Basics'); ?></h2>
- <p><?php _e('<em>Rich editing</em>, also called WYSIWYG for What You See Is What You Get, means your text is formatted as you type. The rich editor creates HTML code behind the scenes while you concentrate on writing. Font styles, links and images all appear approximately as they will on the internet.'); ?></p>
- <p><?php _e('WordPress includes a rich HTML editor that works well in all major web browsers used today. However, editing HTML is not the same as typing text.' );
- echo ' ' . __( 'Each web page has two major components: the structure, which is the actual HTML code and is produced by the editor as you type, and the display, that is applied to it by the currently selected WordPress theme and is defined in style.css.' );
- echo ' ' . __( 'WordPress is producing valid HTML 5 which means that inserting multiple line breaks (BR tags) after a paragraph would not produce white space on the web page. The BR tags will be removed as invalid by the internal HTML correcting functions.');
- ?></p>
- <p><?php _e('While using the editor, most basic keyboard shortcuts work like in any other text editor. For example: Shift+Enter inserts line break, Ctrl+C = copy, Ctrl+X = cut, Ctrl+Z = undo, Ctrl+Y = redo, Ctrl+A = select all, etc. (on Mac use the Command key instead of Ctrl). See the Hotkeys tab for all available keyboard shortcuts.'); ?></p>
- <p><?php _e('If you do not like the way the rich editor works, you may turn it off from Your Profile submenu, under Users in the admin menu.'); ?></p>
-</div>
-
-<div id="content2" class="hidden">
- <h2><?php _e('Advanced Rich Editing'); ?></h2>
- <h3><?php _e('Images and Attachments'); ?></h3>
- <p><?php _e( 'If you want to upload an image or another media file from your computer, you can use the Add Media button above the editor. Select Upload Files or drag the files you wish to upload from the desktop and drop them into the browser window.' );
- echo ' ' . __( 'To insert your image into the post, first click on the thumbnail to reveal a menu of options. When you have selected the options you like, click "Insert into Post" and your image or file will appear in the post you are editing.' );
- ?><p>
- <p><?php _e( 'The Add Media button can also be used for inserting images that are already hosted somewhere on the internet. If you have a URL for an image, click this button, select Insert from URL, and enter the URL in the box which appears.' ); ?></p>
- <h3><?php _e('HTML in the Rich Editor'); ?></h3>
- <p><?php _e('Any HTML entered directly into the rich editor will show up as text when the post is viewed. What you see is what you get. When you want to include HTML elements that cannot be generated with the toolbar buttons, you must enter it by hand in the Text editor. Examples are tables and <code>. To do this, click the Text tab and edit the code, then switch back to Visual mode. If the code is valid and understood by the editor, you should see it rendered immediately.'); ?></p>
- <h3><?php _e('Pasting in the Rich Editor'); ?></h3>
- <p><?php _e('When pasting content from another web page the results can be inconsistent and depend on your browser and on the web page you are pasting from. The editor tries to correct any invalid HTML code that was pasted, but for best results try using the Text tab or the "Paste as text" button on the second row. Alternatively try pasting paragraph by paragraph. In most browsers to select one paragraph at a time, triple-click on it.'); ?></p>
- <p><?php _e('Pasting content from another application, like Word or Excel, is automatically handled. If you want it to appear as plain text instead, you can use "Paste as text" button on the second row, or paste directly in Text mode.'); ?></p>
-</div>
-
-<div id="content3" class="hidden">
- <h2><?php _e('Writing at Full Speed'); ?></h2>
</del><ins>+<div>
</ins><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><span class="cx"> <table class="keys">
</span><span class="lines">@@ -211,41 +142,6 @@
</span><span class="cx"> </table>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div id="content4" class="hidden">
- <h2><?php _e('About TinyMCE'); ?></h2>
-
- <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
- <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 License').'">'); ?></p>
- <p><?php _e('Copyright © 2003-2014, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.'); ?></p>
- <p><?php _e('For more information about this software visit the <a href="http://tinymce.com" target="_blank">TinyMCE website</a>.'); ?></p>
</del><span class="cx"> </div>
</span><del>-
-</div>
-<script type="text/javascript">
- function d(id) {
- return document.getElementById(id);
- }
-
- 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 = 'active';
- } else {
- c.className = 'hidden';
- t.className = '';
- }
- }
- }
-
- if ( win && win.tinymce ) {
- d('version').innerHTML = win.tinymce.majorVersion + "." + win.tinymce.minorVersion;
- d('date').innerHTML = win.tinymce.releaseDate;
- }
-</script>
</del><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/version.php (28031 => 28032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/version.php 2014-04-08 01:56:42 UTC (rev 28031)
+++ trunk/src/wp-includes/version.php 2014-04-08 02:31:02 UTC (rev 28032)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $tinymce_version
</span><span class="cx"> */
</span><del>-$tinymce_version = '4021-20140401';
</del><ins>+$tinymce_version = '4021-20140407';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the required PHP version
</span></span></pre>
</div>
</div>
</body>
</html>