Fixed bug #14625: htmlArea RTE: Inconsistant position of ok button
authorStanislas Rolland <typo3@sjbr.ca>
Sat, 5 Jun 2010 13:13:05 +0000 (13:13 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Sat, 5 Jun 2010 13:13:05 +0000 (13:13 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7808 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/htmlarea/plugins/Acronym/acronym.js
typo3/sysext/rtehtmlarea/htmlarea/plugins/QuickTag/quick-tag.js
typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Color/typo3color.js
typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js

index 6ee284b..ed4704f 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-05  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #14625: htmlArea RTE: Inconsistant position of ok button
+
 2010-06-05  Benjamin Mack  <benni@typo3.org>
 
        * Followup to #14387: Remove the feature "Enable extensions without review (basic security check)" from EM (Thanks to Helmut Hummel)
index 8fc8d96..94fe61f 100644 (file)
@@ -1,3 +1,7 @@
+2010-06-05  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #14625: htmlArea RTE: Inconsistant position of ok button
+
 2010-06-03  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #14397: htmlArea RTE: Incorrect encoding of some labels when BE is not utf-8
index 7e182cf..37453f1 100644 (file)
@@ -42,7 +42,7 @@ HTMLArea.Acronym = HTMLArea.Plugin.extend({
                 * Registering plugin "About" information
                 */
                var pluginInformation = {
-                       version         : "2.0",
+                       version         : "2.1",
                        developer       : "Stanislas Rolland",
                        developerUrl    : "http://www.sjbr.ca/",
                        copyrightOwner  : "Stanislas Rolland",
@@ -220,11 +220,11 @@ HTMLArea.Acronym = HTMLArea.Plugin.extend({
         * @return      object          the buttons configuration
         */
        buildButtonsConfig: function (element, okHandler, deleteHandler) {
-               var buttonsConfig = [this.buildButtonConfig('Cancel', this.onCancel)];
+               var buttonsConfig = [this.buildButtonConfig('OK', okHandler)];
                if (element) {
                        buttonsConfig.push(this.buildButtonConfig('Delete', deleteHandler));
                }
-               buttonsConfig.push(this.buildButtonConfig('OK', okHandler));
+               buttonsConfig.push(this.buildButtonConfig('Cancel', this.onCancel));
                return buttonsConfig;
        },
        /*
index 78bedf1..a949e3e 100644 (file)
@@ -49,7 +49,7 @@ HTMLArea.QuickTag = HTMLArea.Plugin.extend({
                 * Registering plugin "About" information
                 */
                var pluginInformation = {
-                       version         : '2.0',
+                       version         : '2.1',
                        developer       : 'Cau Guanabara & Stanislas Rolland',
                        developerUrl    : 'http://www.sjbr.ca',
                        copyrightOwner  : 'Cau Guanabara & Stanislas Rolland',
@@ -466,8 +466,8 @@ HTMLArea.QuickTag = HTMLArea.Plugin.extend({
                                items: items
                        },
                        buttons: [
-                               this.buildButtonConfig('Cancel', this.onCancel),
-                               this.buildButtonConfig('OK', handler)
+                               this.buildButtonConfig('OK', handler),
+                               this.buildButtonConfig('Cancel', this.onCancel)
                        ]
                });
                this.show();
index 2397543..1625609 100644 (file)
@@ -64,7 +64,7 @@ HTMLArea.TYPO3Color = HTMLArea.Plugin.extend({
                 * Registering plugin "About" information
                 */
                var pluginInformation = {
-                       version         : '4.0',
+                       version         : '4.1',
                        developer       : 'Stanislas Rolland',
                        developerUrl    : 'http://www.sjbr.ca/',
                        copyrightOwner  : 'Stanislas Rolland',
@@ -326,8 +326,8 @@ HTMLArea.TYPO3Color = HTMLArea.Plugin.extend({
                                items: items
                        },
                        buttons: [
-                               this.buildButtonConfig('Cancel', this.onCancel),
-                               this.buildButtonConfig('OK', handler)
+                               this.buildButtonConfig('OK', handler),
+                               this.buildButtonConfig('Cancel', this.onCancel)
                        ]
                });
                this.show();
index 060c7bd..d1ca3cb 100644 (file)
@@ -76,7 +76,7 @@ HTMLArea.TableOperations = HTMLArea.Plugin.extend({
                 * Registering plugin "About" information
                 */
                var pluginInformation = {
-                       version         : "5.0",
+                       version         : "5.1",
                        developer       : "Mihai Bazon & Stanislas Rolland",
                        developerUrl    : "http://www.sjbr.ca/",
                        copyrightOwner  : "Mihai Bazon & Stanislas Rolland",
@@ -373,8 +373,8 @@ HTMLArea.TableOperations = HTMLArea.Plugin.extend({
                                items: tabItems
                        },
                        buttons: [
-                               this.buildButtonConfig('Cancel', this.onCancel),
-                               this.buildButtonConfig('OK', handler)
+                               this.buildButtonConfig('OK', handler),
+                               this.buildButtonConfig('Cancel', this.onCancel)
                        ]
                });
                this.show();