[BUGFIX] Fix dialogs in RTE if static_info_tables is not installed 71/49271/2
authorAndreas Fernandez <a.fernandez@scripting-base.de>
Sun, 31 Jul 2016 06:38:34 +0000 (08:38 +0200)
committerBenni Mack <benni@typo3.org>
Wed, 3 Aug 2016 10:24:18 +0000 (12:24 +0200)
Resolves: #77314
Related: #77137
Releases: master
Change-Id: I5d6c639a96526592d2684db30926902b4c42b8ba
Reviewed-on: https://review.typo3.org/49271
Tested-by: Bamboo TYPO3com <info@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/Plugins/Abbreviation.js
typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/Plugins/EditElement.js
typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/Plugins/TableOperations.js

index a53e7e6..1bd638e 100644 (file)
@@ -253,9 +253,11 @@ define([
                                }
                        });
 
-                       var languageObject = this.getPluginInstance('Language');
                        if (this.getButton('Language')) {
-                               var selectedLanguage = typeof element === 'object' && element !== null ? languageObject.getLanguageAttribute(element) : 'none';
+                               var languageObject = this.getPluginInstance('Language'),
+                                       selectedLanguage = typeof element === 'object' && element !== null
+                                               ? languageObject.getLanguageAttribute(element)
+                                               : 'none';
 
                                $fieldset.append(
                                        $('<div />', {'class': 'form-group'}).append(
index 30d5b89..785a1ea 100644 (file)
@@ -149,7 +149,7 @@ define([
                        if (generalTabItemConfig.length > 0) {
                                this.buildTabMarkup($tabs, $tabContent, 'general', generalTabItemConfig, this.localize('general'));
                        }
-                       if (this.removedFieldsets.indexOf('language') === -1 && this.getPluginInstance('Language')) {
+                       if (this.getButton('Language') && this.removedFieldsets.indexOf('language') === -1 && this.getPluginInstance('Language')) {
                                this.addConfigElement(this.buildLanguageFieldsetConfig(element), languageTabItemConfig);
                                this.buildTabMarkup($tabs, $tabContent, 'language', languageTabItemConfig, this.localize('Language'));
                        }
index d92389a..a568014 100644 (file)
@@ -264,7 +264,7 @@ define([
                        if (layoutTabItems.length > 0) {
                                this.buildTabMarkup($tabs, $tabContent, 'layout', layoutTabItems, this.localize('Layout'));
                        }
-                       if (this.removedFieldsets.indexOf('language') === -1 && (this.removedProperties.indexOf('language') === -1 || this.removedProperties.indexOf('direction') === -1) && (this.getButton('Language') || this.getButton('LeftToRight') || this.getButton('RightToLeft'))) {
+                       if (this.getButton('Language') && this.removedFieldsets.indexOf('language') === -1 && (this.removedProperties.indexOf('language') === -1 || this.removedProperties.indexOf('direction') === -1) && (this.getButton('Language') || this.getButton('LeftToRight') || this.getButton('RightToLeft'))) {
                                this.addConfigElement(this.buildLanguageFieldsetConfig(element), languageTabItems);
                        }
                        if (languageTabItems.length > 0) {