Changeset 27660

Timestamp:

03/23/2014 07:09:23 AM (11 years ago)

Author:

azaozz

Message:

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 #24067, see #24409

Location:

trunk/src

Files:

• wp-admin/css/press-this.css (modified) (4 diffs)
• wp-includes/class-wp-editor.php (modified) (12 diffs)

trunk/src/wp-admin/css/press-this.css

@@ -81 +81 @@
 
 .press-this .posting {
-    margin-right: 252px;
+    margin-right: 250px;
 }
 
@@ -106 +106 @@
 }
 
+.press-this #wp-content-wrap #wp-content-editor-tools {
+    padding: 0;
+    top: 3px;
+    overflow: hidden;
+}
+
 .press-this .wp-media-buttons {
     cursor: default;
     padding: 8px 8px 6px;
+}
+
+.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;
 }
 
@@ -133 +154 @@
 /* Editor/Main Column */
 .press-this #poststuff {
-    margin: 0 10px 10px;
+    margin: 0 8px;
     padding: 0;
 }
@@ -324 +345 @@
     padding: 0 5px;
     border: 0 none;
-    height: 345px;
+    height: 340px;
     font-family: Consolas, Monaco, monospace;
     font-size: 13px;

trunk/src/wp-includes/class-wp-editor.php

@@ -224 +224 @@
                     $mce_external_plugins = apply_filters( 'mce_external_plugins', array() );
 
-                    /**
-                     * 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(
+                    $plugins = array(
                         'charmap',
                         'hr',
@@ -244 +238 @@
                         'wpdialogs',
                         'wpview',
-                    ) ) );
+                    );
+
+                    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 ) );
 
                     if ( ( $key = array_search( 'spellchecker', $plugins ) ) !== false ) {
@@ -508 +514 @@
             add_thickbox();
             wp_enqueue_script('media-upload');
-
-            if ( self::$has_tinymce )
-                wp_enqueue_script('mce-view');
         }
     }
@@ -541 +544 @@
             'Superscript' => __( 'Superscript' ),
             'Clear formatting' => __( 'Clear formatting' ),
-            'Bold' => __('Bold'),
-            'Italic' => __('Italic'),
+            'Bold' => __( 'Bold' ),
+            'Italic' => __( 'Italic' ),
             'Code' => _x( 'Code', 'editor button' ),
             'Source code' => __( 'Source code' ),
 
-            'Align center' => __('Align center'),
-            'Align right' => __('Align right'),
+            'Align center' => __( 'Align center' ),
+            'Align right' => __( 'Align right' ),
             'Align left' => __( 'Align left' ),
-            'Justify' => __('Justify'),
-            'Increase indent' => __('Increase indent'),
-            'Decrease indent' => __('Decrease indent'),
+            'Justify' => __( 'Justify' ),
+            'Increase indent' => __( 'Increase indent' ),
+            'Decrease indent' => __( 'Decrease indent' ),
 
             'Cut' => __( 'Cut' ),
@@ -566 +569 @@
 
             'Bullet list' => __( 'Bulleted list' ),
-            'Numbered list' => __('Numbered list'),
+            'Numbered list' => __( 'Numbered list' ),
             'Square' => _x( 'Square', 'list style' ),
             'Default' => _x( 'Default', 'list style' ),
@@ -592 +595 @@
 
             // Media, image plugins
-            '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'),
+            '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' ),
 
             // Each of these have a corresponding plugin
@@ -626 +629 @@
             'Horizontal space' => __( 'Horizontal space' ),
             'Restore last draft' => __( 'Restore last draft' ),
+            'Insert/edit link' => __( 'Insert/edit link' ),
 
             // Spelling, search/replace plugins
@@ -634 +638 @@
             'Prev' => _x( 'Prev', 'find/replace' ),
             'Whole words' => _x( 'Whole words', 'find/replace' ),
-            'Find and replace' => __('Find and replace' ),
+            'Find and replace' => __( 'Find and replace' ),
             'Replace with' => _x('Replace with', 'find/replace' ),
             'Find' => _x( 'Find', 'find/replace' ),
             'Replace all' => _x( 'Replace all', 'find/replace' ),
-            'Match case' => __('Match case'),
+            'Match case' => __( 'Match case' ),
             'Spellcheck' => __( 'Check Spelling' ),
             'Finish' => _x( 'Finish', 'spellcheck' ),
@@ -662 +666 @@
 
             'Insert row before' => __( 'Insert row before' ),
-            'Insert row after' => __('Insert row after'),
+            'Insert row after' => __( 'Insert row after' ),
             'Insert column before' => __( 'Insert column before' ),
             'Insert column after' => __( 'Insert column after' ),
@@ -668 +672 @@
             'Paste row after' => __( 'Paste table row after' ),
             'Delete row' => __( 'Delete row' ),
-            'Delete column' => __('Delete column'),
-            'Cut row' => __('Cut table row' ),
+            'Delete column' => __( 'Delete column' ),
+            'Cut row' => __( 'Cut table row' ),
             'Copy row' => __( 'Copy table row' ),
             'Merge cells' => __( 'Merge table cells' ),
-            'Split cell' => __( 'Split merged table cells' ),
+            'Split cell' => __( 'Split table cell' ),
 
             'Height' => __( 'Height' ),
-            'Width' => __('Width'),
+            'Width' => __( 'Width' ),
             'Caption' => __( 'Caption' ),
             'Alignment' => __( 'Alignment' ),
@@ -700 +704 @@
             /* translators: word count */
             'Words: {0}' => sprintf( __( 'Words: %s' ), '{0}' ),
-            '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'),
+            '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' ),
             '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.' ),
-            '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.'),
+            '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.' ),
 
             // TinyMCE menus
@@ -715 +719 @@
 
             // WordPress strings
-            'Help' => __('Help'),
-            'Toolbar Toggle' => __('Toolbar Toggle'),
-            'Insert Read More tag' => __('Insert Read More tag'),
-            'Distraction Free Writing' => __('Distraction Free Writing'),
+            'Help' => __( 'Help' ),
+            'Toolbar Toggle' => __( 'Toolbar Toggle' ),
+            'Insert Read More tag' => __( 'Insert Read More tag' ),
+            'Distraction Free Writing' => __( 'Distraction Free Writing' ),
         );