<!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>[27660] trunk/src: TinyMCE:</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/27660">27660</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-03-23 07:09:23 +0000 (Sun, 23 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE:
- Fix PressThis styling when the popup is resized.
- Don't force loading of the media JS.
- Add the 'image' plugin as fallback when no media button(s).
- Add back the link icon tooltip/menu item string for translation.
See <a href="http://core.trac.wordpress.org/ticket/24067">#24067</a>, see <a href="http://core.trac.wordpress.org/ticket/24409">#24409</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsspressthiscss">trunk/src/wp-admin/css/press-this.css</a></li>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsspressthiscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/press-this.css (27659 => 27660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/press-this.css 2014-03-23 03:35:50 UTC (rev 27659)
+++ trunk/src/wp-admin/css/press-this.css 2014-03-23 07:09:23 UTC (rev 27660)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .press-this .posting {
</span><del>- margin-right: 252px;
</del><ins>+ margin-right: 250px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .press-this-sidebar {
</span><span class="lines">@@ -105,11 +105,32 @@
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.press-this #wp-content-wrap #wp-content-editor-tools {
+ padding: 0;
+ top: 3px;
+ overflow: hidden;
+}
+
</ins><span class="cx"> .press-this .wp-media-buttons {
</span><span class="cx"> cursor: default;
</span><span class="cx"> padding: 8px 8px 6px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.press-this #wp-content-wrap #wp-content-media-buttons a {
+ padding: 0;
+ line-height: normal;
+ height: auto;
+ font-size: 16px;
+}
+
+.press-this #wp-content-wrap .mce-toolbar .mce-btn-group .mce-btn {
+ margin: 0 1px;
+}
+
+.press-this #wp-content-wrap .mce-toolbar .mce-btn button {
+ padding: 2px 3px;
+}
+
</ins><span class="cx"> .press-this .howto {
</span><span class="cx"> margin-top: 2px;
</span><span class="cx"> margin-bottom: 3px;
</span><span class="lines">@@ -132,7 +153,7 @@
</span><span class="cx">
</span><span class="cx"> /* Editor/Main Column */
</span><span class="cx"> .press-this #poststuff {
</span><del>- margin: 0 10px 10px;
</del><ins>+ margin: 0 8px;
</ins><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -323,7 +344,7 @@
</span><span class="cx"> margin: 5px 0;
</span><span class="cx"> padding: 0 5px;
</span><span class="cx"> border: 0 none;
</span><del>- height: 345px;
</del><ins>+ height: 340px;
</ins><span class="cx"> font-family: Consolas, Monaco, monospace;
</span><span class="cx"> font-size: 13px;
</span><span class="cx"> line-height: 19px;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (27659 => 27660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php 2014-03-23 03:35:50 UTC (rev 27659)
+++ trunk/src/wp-includes/class-wp-editor.php 2014-03-23 07:09:23 UTC (rev 27660)
</span><span class="lines">@@ -223,13 +223,7 @@
</span><span class="cx"> */
</span><span class="cx"> $mce_external_plugins = apply_filters( 'mce_external_plugins', array() );
</span><span class="cx">
</span><del>- /**
- * TinyMCE default plugins filter
- *
- * Specifies which of the default plugins that are included in WordPress should be added to
- * the TinyMCE instance.
- */
- $plugins = array_unique( apply_filters( 'tiny_mce_plugins', array(
</del><ins>+ $plugins = array(
</ins><span class="cx"> 'charmap',
</span><span class="cx"> 'hr',
</span><span class="cx"> 'media',
</span><span class="lines">@@ -243,8 +237,20 @@
</span><span class="cx"> 'wplink',
</span><span class="cx"> 'wpdialogs',
</span><span class="cx"> 'wpview',
</span><del>- ) ) );
</del><ins>+ );
</ins><span class="cx">
</span><ins>+ if ( ! self::$has_medialib ) {
+ $plugins[] = 'image';
+ }
+
+ /**
+ * TinyMCE default plugins filter
+ *
+ * Specifies which of the default plugins that are included in WordPress should be added to
+ * the TinyMCE instance.
+ */
+ $plugins = array_unique( apply_filters( 'tiny_mce_plugins', $plugins ) );
+
</ins><span class="cx"> if ( ( $key = array_search( 'spellchecker', $plugins ) ) !== false ) {
</span><span class="cx"> // Remove 'spellchecker' from the internal plugins if added with 'tiny_mce_plugins' filter to prevent errors.
</span><span class="cx"> // It can be added with 'mce_external_plugins'.
</span><span class="lines">@@ -507,9 +513,6 @@
</span><span class="cx"> if ( self::$has_medialib ) {
</span><span class="cx"> add_thickbox();
</span><span class="cx"> wp_enqueue_script('media-upload');
</span><del>-
- if ( self::$has_tinymce )
- wp_enqueue_script('mce-view');
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -540,17 +543,17 @@
</span><span class="cx"> 'Subscript' => __( 'Subscript' ),
</span><span class="cx"> 'Superscript' => __( 'Superscript' ),
</span><span class="cx"> 'Clear formatting' => __( 'Clear formatting' ),
</span><del>- 'Bold' => __('Bold'),
- 'Italic' => __('Italic'),
</del><ins>+ 'Bold' => __( 'Bold' ),
+ 'Italic' => __( 'Italic' ),
</ins><span class="cx"> 'Code' => _x( 'Code', 'editor button' ),
</span><span class="cx"> 'Source code' => __( 'Source code' ),
</span><span class="cx">
</span><del>- 'Align center' => __('Align center'),
- 'Align right' => __('Align right'),
</del><ins>+ 'Align center' => __( 'Align center' ),
+ 'Align right' => __( 'Align right' ),
</ins><span class="cx"> 'Align left' => __( 'Align left' ),
</span><del>- 'Justify' => __('Justify'),
- 'Increase indent' => __('Increase indent'),
- 'Decrease indent' => __('Decrease indent'),
</del><ins>+ 'Justify' => __( 'Justify' ),
+ 'Increase indent' => __( 'Increase indent' ),
+ 'Decrease indent' => __( 'Decrease indent' ),
</ins><span class="cx">
</span><span class="cx"> 'Cut' => __( 'Cut' ),
</span><span class="cx"> 'Copy' => __( 'Copy' ),
</span><span class="lines">@@ -565,7 +568,7 @@
</span><span class="cx"> 'Visual aids' => __( 'Visual aids' ),
</span><span class="cx">
</span><span class="cx"> 'Bullet list' => __( 'Bulleted list' ),
</span><del>- 'Numbered list' => __('Numbered list'),
</del><ins>+ 'Numbered list' => __( 'Numbered list' ),
</ins><span class="cx"> 'Square' => _x( 'Square', 'list style' ),
</span><span class="cx"> 'Default' => _x( 'Default', 'list style' ),
</span><span class="cx"> 'Circle' => _x( 'Circle', 'list style' ),
</span><span class="lines">@@ -591,24 +594,24 @@
</span><span class="cx"> 'Author' => __( 'Author' ),
</span><span class="cx">
</span><span class="cx"> // Media, image plugins
</span><del>- 'Insert/edit image' => __('Insert/edit image'),
- 'General' => __('General'),
- 'Advanced' => __('Advanced'),
- 'Source' => __('Source'),
- 'Border' => __('Border'),
- 'Constrain proportions' => __('Constrain proportions'),
- 'Vertical space' => __('Vertical space'),
- 'Image description' => __('Image description'),
- 'Style' => __('Style'),
- 'Dimensions' => __('Dimensions'),
- 'Insert image' => __('Insert image'),
- 'Insert date/time' => __('Insert date/time'),
- 'Insert/edit video' => __('Insert/edit video'),
- 'Poster' => __('Poster'),
- 'Alternative source' => __('Alternative source'),
- 'Paste your embed code below:' => __('Paste your embed code below:'),
- 'Insert video' => __('Insert video'),
- 'Embed' => __('Embed'),
</del><ins>+ 'Insert/edit image' => __( 'Insert/edit image' ),
+ 'General' => __( 'General' ),
+ 'Advanced' => __( 'Advanced' ),
+ 'Source' => __( 'Source' ),
+ 'Border' => __( 'Border' ),
+ 'Constrain proportions' => __( 'Constrain proportions' ),
+ 'Vertical space' => __( 'Vertical space' ),
+ 'Image description' => __( 'Image description' ),
+ 'Style' => __( 'Style' ),
+ 'Dimensions' => __( 'Dimensions' ),
+ 'Insert image' => __( 'Insert image' ),
+ 'Insert date/time' => __( 'Insert date/time' ),
+ 'Insert/edit video' => __( 'Insert/edit video' ),
+ 'Poster' => __( 'Poster' ),
+ 'Alternative source' => __( 'Alternative source' ),
+ 'Paste your embed code below:' => __( 'Paste your embed code below:' ),
+ 'Insert video' => __( 'Insert video' ),
+ 'Embed' => __( 'Embed' ),
</ins><span class="cx">
</span><span class="cx"> // Each of these have a corresponding plugin
</span><span class="cx"> 'Special character' => __( 'Special character' ),
</span><span class="lines">@@ -625,6 +628,7 @@
</span><span class="cx"> 'Horizontal line' => __( 'Horizontal line' ),
</span><span class="cx"> 'Horizontal space' => __( 'Horizontal space' ),
</span><span class="cx"> 'Restore last draft' => __( 'Restore last draft' ),
</span><ins>+ 'Insert/edit link' => __( 'Insert/edit link' ),
</ins><span class="cx">
</span><span class="cx"> // Spelling, search/replace plugins
</span><span class="cx"> 'Could not find the specified string.' => __( 'Could not find the specified string.' ),
</span><span class="lines">@@ -633,11 +637,11 @@
</span><span class="cx"> /* translators: previous */
</span><span class="cx"> 'Prev' => _x( 'Prev', 'find/replace' ),
</span><span class="cx"> 'Whole words' => _x( 'Whole words', 'find/replace' ),
</span><del>- 'Find and replace' => __('Find and replace' ),
</del><ins>+ 'Find and replace' => __( 'Find and replace' ),
</ins><span class="cx"> 'Replace with' => _x('Replace with', 'find/replace' ),
</span><span class="cx"> 'Find' => _x( 'Find', 'find/replace' ),
</span><span class="cx"> 'Replace all' => _x( 'Replace all', 'find/replace' ),
</span><del>- 'Match case' => __('Match case'),
</del><ins>+ 'Match case' => __( 'Match case' ),
</ins><span class="cx"> 'Spellcheck' => __( 'Check Spelling' ),
</span><span class="cx"> 'Finish' => _x( 'Finish', 'spellcheck' ),
</span><span class="cx"> 'Ignore all' => _x( 'Ignore all', 'spellcheck' ),
</span><span class="lines">@@ -661,20 +665,20 @@
</span><span class="cx"> 'Footer' => _x( 'Footer', 'table footer' ),
</span><span class="cx">
</span><span class="cx"> 'Insert row before' => __( 'Insert row before' ),
</span><del>- 'Insert row after' => __('Insert row after'),
</del><ins>+ 'Insert row after' => __( 'Insert row after' ),
</ins><span class="cx"> 'Insert column before' => __( 'Insert column before' ),
</span><span class="cx"> 'Insert column after' => __( 'Insert column after' ),
</span><span class="cx"> 'Paste row before' => __( 'Paste table row before' ),
</span><span class="cx"> 'Paste row after' => __( 'Paste table row after' ),
</span><span class="cx"> 'Delete row' => __( 'Delete row' ),
</span><del>- 'Delete column' => __('Delete column'),
- 'Cut row' => __('Cut table row' ),
</del><ins>+ 'Delete column' => __( 'Delete column' ),
+ 'Cut row' => __( 'Cut table row' ),
</ins><span class="cx"> 'Copy row' => __( 'Copy table row' ),
</span><span class="cx"> 'Merge cells' => __( 'Merge table cells' ),
</span><del>- 'Split cell' => __( 'Split merged table cells' ),
</del><ins>+ 'Split cell' => __( 'Split table cell' ),
</ins><span class="cx">
</span><span class="cx"> 'Height' => __( 'Height' ),
</span><del>- 'Width' => __('Width'),
</del><ins>+ 'Width' => __( 'Width' ),
</ins><span class="cx"> 'Caption' => __( 'Caption' ),
</span><span class="cx"> 'Alignment' => __( 'Alignment' ),
</span><span class="cx"> 'Left' => __( 'Left' ),
</span><span class="lines">@@ -699,10 +703,10 @@
</span><span class="cx">
</span><span class="cx"> /* translators: word count */
</span><span class="cx"> 'Words: {0}' => sprintf( __( 'Words: %s' ), '{0}' ),
</span><del>- 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' => __('Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.'),
- 'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' => __('Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help'),
</del><ins>+ 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' => __( 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' ),
+ 'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' => __( 'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' ),
</ins><span class="cx"> 'You have unsaved changes are you sure you want to navigate away?' => __( 'The changes you made will be lost if you navigate away from this page.' ),
</span><del>- 'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' => __('Your browser does not support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.'),
</del><ins>+ 'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' => __( 'Your browser does not support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' ),
</ins><span class="cx">
</span><span class="cx"> // TinyMCE menus
</span><span class="cx"> 'Insert' => _x( 'Insert', 'TinyMCE menu' ),
</span><span class="lines">@@ -714,10 +718,10 @@
</span><span class="cx"> 'Format' => _x( 'Format', 'TinyMCE menu' ),
</span><span class="cx">
</span><span class="cx"> // WordPress strings
</span><del>- 'Help' => __('Help'),
- 'Toolbar Toggle' => __('Toolbar Toggle'),
- 'Insert Read More tag' => __('Insert Read More tag'),
- 'Distraction Free Writing' => __('Distraction Free Writing'),
</del><ins>+ 'Help' => __( 'Help' ),
+ 'Toolbar Toggle' => __( 'Toolbar Toggle' ),
+ 'Insert Read More tag' => __( 'Insert Read More tag' ),
+ 'Distraction Free Writing' => __( 'Distraction Free Writing' ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $baseurl = self::$baseurl;
</span></span></pre>
</div>
</div>
</body>
</html>