Index: typo3/sysext/rtehtmlarea/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php
===================================================================
--- typo3/sysext/rtehtmlarea/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php (révision 7039)
+++ typo3/sysext/rtehtmlarea/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php (copie de travail)
@@ -178,7 +178,7 @@
$JSBlockElements[] = array($label, $item);
}
$registerRTEinJavascriptString .= '
- RTEarea['.$RTEcounter.'].buttons.formatblock.data = ' . json_encode($JSBlockElements) . ';';
+ RTEarea['.$RTEcounter.'].buttons.formatblock.options = ' . json_encode($JSBlockElements) . ';';
}
return $registerRTEinJavascriptString;
}
Index: typo3/sysext/rtehtmlarea/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php
===================================================================
--- typo3/sysext/rtehtmlarea/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php (révision 7039)
+++ typo3/sysext/rtehtmlarea/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php (copie de travail)
@@ -208,16 +208,12 @@
$JSInlineElements[] = array($label, $item);
}
$registerRTEinJavascriptString .= '
- RTEarea['.$RTEcounter.'].buttons.formattext.data = ' . json_encode($JSInlineElements) . ';';
+ RTEarea['.$RTEcounter.'].buttons.formattext.options = ' . json_encode($JSInlineElements) . ';';
}
return $registerRTEinJavascriptString;
}
-
-
-} // end of class
-
+}
if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php']) {
include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php']);
}
-
?>
\ No newline at end of file
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js (révision 7039)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js (copie de travail)
@@ -123,7 +123,7 @@
var dropDownConfiguration = {
id: buttonId,
tooltip: this.localize(buttonId + "-Tooltip"),
- options: (this.buttonsConfiguration.formatblock ? this.buttonsConfiguration.formatblock.data : null),
+ options: this.buttonsConfiguration.formatblock ? this.buttonsConfiguration.formatblock.options : [],
action: "onChange"
};
if (this.buttonsConfiguration.formatblock) {
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/inline-elements.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/inline-elements.js (révision 7039)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/inline-elements.js (copie de travail)
@@ -80,9 +80,20 @@
var dropDownConfiguration = {
id : buttonId,
tooltip : this.localize(buttonId + "-Tooltip"),
- options : (this.editorConfiguration.buttons[buttonId.toLowerCase()] ? this.editorConfiguration.buttons[buttonId.toLowerCase()].data : null),
+ options : (this.editorConfiguration.buttons[buttonId.toLowerCase()] ? this.editorConfiguration.buttons[buttonId.toLowerCase()].options : []),
action : "onChange"
};
+ if (this.editorConfiguration.buttons.formattext) {
+ if (this.editorConfiguration.buttons.formattext.width) {
+ dropDownConfiguration.listWidth = parseInt(this.editorConfiguration.buttons.formattext.width, 10);
+ }
+ if (this.editorConfiguration.buttons.formattext.listWidth) {
+ dropDownConfiguration.listWidth = parseInt(this.editorConfiguration.buttons.formattext.listWidth, 10);
+ }
+ if (this.editorConfiguration.buttons.formattext.maxHeight) {
+ dropDownConfiguration.maxHeight = parseInt(this.editorConfiguration.buttons.formattext.maxHeight, 10);
+ }
+ }
this.registerDropDown(dropDownConfiguration);
/*