Index: /CKEditor/branches/versions/3.5.x/CHANGES.html =================================================================== --- /CKEditor/branches/versions/3.5.x/CHANGES.html (revision 5913) +++ /CKEditor/branches/versions/3.5.x/CHANGES.html (revision 5914) @@ -39,4 +39,7 @@
New features:
+Fixed issues:
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/dialog/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/dialog/plugin.js (revision 5913) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/dialog/plugin.js (revision 5914) @@ -81,8 +81,17 @@ { // 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' && dir == 'ltr' ) || + ( buttonsOrder == 'ltr' && dir == 'rtl' ) ) + 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. @@ -1302,7 +1311,4 @@ 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 @@ -2952,4 +2958,19 @@ /** + * The guildeline to follow when generating the dialog buttons. There are 3 possible options: + *