Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/SelectFont/select-font.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/SelectFont/select-font.js (révision 8062)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/SelectFont/select-font.js (copie de travail)
@@ -77,25 +77,27 @@
*/
Ext.each(this.dropDownList, function (dropDown) {
var buttonId = dropDown[0];
- var dropDownConfiguration = {
- id: buttonId,
- tooltip: this.localize(buttonId.toLowerCase()),
- storeUrl: this.buttonsConfiguration[dropDown[2]].dataUrl,
- action: 'onChange',
- tpl: this.disablePCexamples ? '' : '{text}
'
- };
- if (this.buttonsConfiguration[dropDown[2]]) {
- if (this.editorConfiguration.buttons[dropDown[2]].width) {
- dropDownConfiguration.width = parseInt(this.editorConfiguration.buttons[dropDown[2]].width, 10);
+ if (this.isButtonInToolbar(buttonId)) {
+ var dropDownConfiguration = {
+ id: buttonId,
+ tooltip: this.localize(buttonId.toLowerCase()),
+ storeUrl: this.buttonsConfiguration[dropDown[2]].dataUrl,
+ action: 'onChange',
+ tpl: this.disablePCexamples ? '' : '{text}
'
+ };
+ if (this.buttonsConfiguration[dropDown[2]]) {
+ if (this.editorConfiguration.buttons[dropDown[2]].width) {
+ dropDownConfiguration.width = parseInt(this.editorConfiguration.buttons[dropDown[2]].width, 10);
+ }
+ if (this.editorConfiguration.buttons[dropDown[2]].listWidth) {
+ dropDownConfiguration.listWidth = parseInt(this.editorConfiguration.buttons[dropDown[2]].listWidth, 10);
+ }
+ if (this.editorConfiguration.buttons[dropDown[2]].maxHeight) {
+ dropDownConfiguration.maxHeight = parseInt(this.editorConfiguration.buttons[dropDown[2]].maxHeight, 10);
+ }
}
- if (this.editorConfiguration.buttons[dropDown[2]].listWidth) {
- dropDownConfiguration.listWidth = parseInt(this.editorConfiguration.buttons[dropDown[2]].listWidth, 10);
- }
- if (this.editorConfiguration.buttons[dropDown[2]].maxHeight) {
- dropDownConfiguration.maxHeight = parseInt(this.editorConfiguration.buttons[dropDown[2]].maxHeight, 10);
- }
+ this.registerDropDown(dropDownConfiguration);
}
- this.registerDropDown(dropDownConfiguration);
return true;
}, this);
return true;
@@ -127,10 +129,12 @@
onGenerate: function () {
// Load the dropdowns
Ext.each(this.dropDownList, function (dropDown) {
- this.getButton(dropDown[0]).getStore().load({
- callback: function () { this.getButton(dropDown[0]).setValue('none'); },
- scope: this
- })
+ if (this.getButton(dropDown[0])) {
+ this.getButton(dropDown[0]).getStore().load({
+ callback: function () { this.getButton(dropDown[0]).setValue('none'); },
+ scope: this
+ })
+ }
}, this);
},
/*