Changeset 28094

Timestamp:

04/13/2014 12:22:56 AM (10 years ago)

Author:

azaozz

Message:

RTL for TinyMCE:

• Add _dir: 'rtl' to the TinyMCE translation object.
• Fix editor.css for RTL.
• Fix the Edit and Delete buttons position for wpview and images.
• For _mce_set_direction(), update documentation and fix adding the 'ltr' button.

Fixes #27773

Location:

trunk/src/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• css/editor.css (modified) (1 diff)
• functions.php (modified) (2 diffs)
• js/tinymce/plugins/wordpress/plugin.js (modified) (1 diff)
• js/tinymce/plugins/wpeditimage/plugin.js (modified) (2 diffs)
• js/tinymce/skins/wordpress/wp-content.css (modified) (1 diff)

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

@@ -982 +982 @@
         $baseurl = self::$baseurl;
         $mce_locale = self::$mce_locale;
+
+        // Set direction
+        if ( is_rtl() ) {
+            $mce_translation['_dir'] = 'rtl';
+        }
 
         /**

trunk/src/wp-includes/css/editor.css

@@ -1852 +1852 @@
 }
 
+/* @noflip */
+.mce-rtl .mce-flow-layout .mce-flow-layout-item > div {
+    direction: rtl;
+}
+
+/* @noflip */
+.mce-rtl .mce-listbox i.mce-caret {
+    left: 6px;
+}
+
 html:lang(he-il) .rtl .wp-switch-editor,
 html:lang(he-il) .rtl .quicktags-toolbar input  {

trunk/src/wp-includes/functions.php

@@ -2458 +2458 @@
  * direction set to 'rtl'.
  *
- * Fills in the 'directionality', 'plugins', and 'theme_advanced_button1' array
- * keys. These keys are then returned in the $input array.
+ * Fills in the 'directionality' setting, enables the 'directionality' 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.
  *
  * @access private
  * @since 2.1.0
  *
- * @param array $input MCE plugin array.
+ * @param array $input MCE settings array.
  * @return array Direction set for 'rtl', if needed by locale.
  */
@@ -2471 +2472 @@
         $input['directionality'] = 'rtl';
         $input['plugins'] .= ',directionality';
-        $input['theme_advanced_buttons1'] .= ',ltr';
+        $input['toolbar1'] .= ',ltr';
     }
 

trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -280 +280 @@
         if ( editor.getParam( 'directionality' ) === 'rtl' ) {
             bodyClass.push('rtl');
+            dom.setAttrib( doc.documentElement, 'dir', 'rtl' );
         }
 

trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -404 +404 @@
 
     function addToolbar( node ) {
-        var rectangle, toolbarHtml, toolbar, toolbarSize,
+        var rectangle, toolbarHtml, toolbar, left,
             dom = editor.dom;
 
@@ -426 +426 @@
         }, toolbarHtml );
 
+        if ( editor.rtl ) {
+            left = rectangle.x + rectangle.w - 82;
+        } else {
+            left = rectangle.x;
+        }
+
         editor.getBody().appendChild( toolbar );
-        toolbarSize = dom.getSize( toolbar );
-
         dom.setStyles( toolbar, {
             top: rectangle.y,
-            left: rectangle.x
+            left: left
         });
 

trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css

@@ -454 +454 @@
 }
 
+/* rtl */
+.rtl .gallery .gallery-item {
+    float: right;
+}
+
+.rtl .wpview-wrap .toolbar {
+    left: auto;
+    right: 0;
+}
+
+.rtl .wpview-wrap .toolbar div,
+.rtl #wp-image-toolbar div {
+    margin-left: auto;
+    margin-right: 7px;
+}
+
 @media print,
     (-o-min-device-pixel-ratio: 5/4),