Fixed bug #14374: htmlArea RTE: Language plugin may cause js error on RTE initialization

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7584 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 7215a89..69da622 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-05-12  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Follow-up to bug #14360: htmlArea RTE: Toolbar and context menu styling needs adjustments
+       * Fixed bug #14374: htmlArea RTE: Language plugin may cause js error on RTE initialization
 
 2010-05-12  Dmitry Dulepov  <dmitry.dulepov@gmail.com>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index a272fb8..e6ace8d 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,6 +1,7 @@
 2010-05-12  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Follow-up to bug #14360: htmlArea RTE: Toolbar and context menu styling needs adjustments
+       * Fixed bug #14374: htmlArea RTE: Language plugin may cause js error on RTE initialization
 
 2010-05-10  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/Language/language.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/Language/language.js
index a1fa882..dd93956 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/Language/language.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/Language/language.js
@@ -67,18 +67,17 @@ HTMLArea.Language = HTMLArea.Plugin.extend({
                                this.allowedAttributes.push("className");
                        }
                }
-
                /*
                 * Registering plugin "About" information
                 */
                var pluginInformation = {
-                       version         : "1.0",
-                       developer       : "Stanislas Rolland",
-                       developerUrl    : "http://www.sjbr.ca/",
-                       copyrightOwner  : "Stanislas Rolland",
-                       sponsor         : this.localize("Technische Universitat Ilmenau"),
-                       sponsorUrl      : "http://www.tu-ilmenau.de/",
-                       license         : "GPL"
+                       version         : '2.0',
+                       developer       : 'Stanislas Rolland',
+                       developerUrl    : 'http://www.sjbr.ca/',
+                       copyrightOwner  : 'Stanislas Rolland',
+                       sponsor         : this.localize('Technische Universitat Ilmenau'),
+                       sponsorUrl      : 'http://www.tu-ilmenau.de/',
+                       license         : 'GPL'
                };
                this.registerPluginInformation(pluginInformation);
                /*
@@ -154,12 +153,12 @@ HTMLArea.Language = HTMLArea.Plugin.extend({
                                }
                                return true;
                        });
+                               // Load the language dropdown
+                       select.getStore().load({
+                               callback: function () { this.getButton('Language').setValue('none'); },
+                               scope: this
+                       });
                }
-                       // Load the language dropdown
-               this.getButton('Language').getStore().load({
-                       callback: function () { this.getButton('Language').setValue('none'); },
-                       scope: this
-               });
        },
        /*
         * This function gets called when a button was pressed.