Ticket #5755: 5755_2.patch

_source/plugins/dialog/plugin.js

@@ -104 +104 @@
         CKEDITOR.dialog = function( editor, dialogName )
         {
                 // Load the dialog definition.
-                var definition = CKEDITOR.dialog._.dialogDefinitions[ dialogName ];
+                var definition = CKEDITOR.dialog._.dialogDefinitions[ dialogName ],
+                        defaultDefinition = CKEDITOR.tools.clone( defaultDialogDefinition ),
+                        buttonsOrder = editor.config.dialog_buttonsOrder || 'OS',
+                        dir = editor.lang.dir;
 
+                if ( ( buttonsOrder == 'OS' && CKEDITOR.env.mac ) ||    // The buttons in MacOS Apps are in reverse order (#4750)
+                        ( buttonsOrder == 'rtl' || buttonsOrder == 'OS' && dir == 'rtl' ) ) // The buttons in RTL should be located in the reverse order
+                                defaultDefinition.buttons.reverse();
+
                 // Completes the definition with the default values.
-                definition = CKEDITOR.tools.extend( definition( editor ), defaultDialogDefinition );
+                definition = CKEDITOR.tools.extend( definition( editor ), defaultDefinition );
 
                 // Clone a functionally independent copy for this dialog.
                 definition = CKEDITOR.tools.clone( definition );
@@ -1344 +1351 @@
                 buttons : [ CKEDITOR.dialog.okButton, CKEDITOR.dialog.cancelButton ]
         };
 
-        // The buttons in MacOS Apps are in reverse order #4750
-        CKEDITOR.env.mac && defaultDialogDefinition.buttons.reverse();
-
         // Tool function used to return an item from an array based on its id
         // property.
         var getById = function( array, id, recurse )
@@ -2993 +2997 @@
  */
 
 /**
+ * The guildeline to follow when generating the dialog buttons. There are 3 possible options:
+ * <ul>
+ *     <li>'OS' - the buttons will be displayed in the default order of the user's OS;</li>
+ *     <li>'ltr' - for Left-To-Right order;</li>
+ *     <li>'rtl' - for Right-To-Left order.</li>
+ * </ul>
+ * @name CKEDITOR.config.dialog_buttonsOrder
+ * @type String
+ * @default 'OS'
+ * @since 3.5
+ * @example
+ * config.dialog_buttonsOrder = 'rtl';
+ */
+
+/**
  * Fired when a dialog definition is about to be used to create a dialog into
  * an editor instance. This event makes it possible to customize the definition
  * before creating it.