Changeset 38488

Timestamp:

08/31/2016 11:42:15 PM (8 years ago)

Author:

jeremyfelt

Message:

TinyMCE: fix toolbars alignment in RTL.

Merge of [38349] to the 4.6 branch.

Props azaozz, geminorum for testing.
Fixes #37760.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-editor.php (modified) (1 diff)
• src/wp-includes/css/editor.css (modified) (1 diff)
• src/wp-includes/functions.php (modified) (1 diff)

branches/4.6/src/wp-includes/class-wp-editor.php

@@ -1260 +1260 @@
 
             if ( typeof tinymce !== 'undefined' ) {
+                // Fix RTL
+                tinymce.on( 'addeditor', function( event ) {
+                    event.editor.rtl = event.editor.settings.rtl_ui ||
+                        ( event.editor.editorManager &&
+                        event.editor.editorManager.i18n &&
+                        event.editor.editorManager.i18n.rtl );
+                }, true );
+
                 for ( id in tinyMCEPreInit.mceInit ) {
                     init = tinyMCEPreInit.mceInit[id];

branches/4.6/src/wp-includes/css/editor.css

@@ -391 +391 @@
     text-shadow: none;
     cursor: pointer;
+}
+
+.mce-btn .mce-txt {
+    direction: inherit;
+    text-align: inherit;
 }
 

branches/4.6/src/wp-includes/functions.php

@@ -3191 +3191 @@
  * plugin, and adds the 'ltr' button to 'toolbar1', formerly
  * 'theme_advanced_buttons1' array keys. These keys are then returned
- * in the $input (TinyMCE settings) array.
+ * in the $mce_init (TinyMCE settings) array.
  *
  * @since 2.1.0
  * @access private
  *
- * @param array $input MCE settings array.
+ * @param array $mce_init MCE settings array.
  * @return array Direction set for 'rtl', if needed by locale.
  */
-function _mce_set_direction( $input ) {
+function _mce_set_direction( $mce_init ) {
     if ( is_rtl() ) {
-        $input['directionality'] = 'rtl';
-
-        if ( ! empty( $input['plugins'] ) && strpos( $input['plugins'], 'directionality' ) === false ) {
-            $input['plugins'] .= ',directionality';
-        }
-
-        if ( ! empty( $input['toolbar1'] ) && ! preg_match( '/\bltr\b/', $input['toolbar1'] ) ) {
-            $input['toolbar1'] .= ',ltr';
-        }
-    }
-
-    return $input;
+        $mce_init['directionality'] = 'rtl';
+        $mce_init['rtl_ui'] = true;
+
+        if ( ! empty( $mce_init['plugins'] ) && strpos( $mce_init['plugins'], 'directionality' ) === false ) {
+            $mce_init['plugins'] .= ',directionality';
+        }
+
+        if ( ! empty( $mce_init['toolbar1'] ) && ! preg_match( '/\bltr\b/', $mce_init['toolbar1'] ) ) {
+            $mce_init['toolbar1'] .= ',ltr';
+        }
+    }
+
+    return $mce_init;
 }