Fixed bug #13672: htmlArea RTE: Conflicting configuration property name
authorStanislas Rolland <typo3@sjbr.ca>
Fri, 26 Feb 2010 02:58:32 +0000 (02:58 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Fri, 26 Feb 2010 02:58:32 +0000 (02:58 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7041 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php
typo3/sysext/rtehtmlarea/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php
typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js
typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/inline-elements.js

index 64c154e..dec4f7d 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        * Added feature #13667: htmlArea RTE: Make toolbar dropdown size configurable in Page TSConfig
        * Cleanup #13668: htmlArea RTE: Cleanup some unused code (acronym, color, font)
        * Fixed bug #13671: htmlArea RTE: Invalid reference to font options in WebKit browsers
+       * Fixed bug #13672: htmlArea RTE: Conflicting configuration property name
 
 2010-02-24  Ernesto Baschny  <ernst@cron-it.de>
 
index eea8c58..e97364d 100644 (file)
@@ -4,6 +4,7 @@
        * Added feature #13667: htmlArea RTE: Make toolbar dropdown size configurable in Page TSConfig
        * Cleanup #13668: htmlArea RTE: Cleanup some unused code (acronym, color, font)
        * Fixed bug #13671: htmlArea RTE: Invalid reference to font options in WebKit browsers
+       * Fixed bug #13672: htmlArea RTE: Conflicting configuration property name
 
 2010-02-22  Stanislas Rolland  <typo3@sjbr.ca>
 
index df748fc..c313d48 100644 (file)
@@ -178,7 +178,7 @@ class tx_rtehtmlarea_blockelements extends tx_rtehtmlareaapi {
                                $JSBlockElements[] = array($label, $item);
                        }
                        $registerRTEinJavascriptString .= '
-                       RTEarea['.$RTEcounter.'].buttons.formatblock.data = ' . json_encode($JSBlockElements) . ';';
+                       RTEarea['.$RTEcounter.'].buttons.formatblock.options = ' . json_encode($JSBlockElements) . ';';
                }
                return $registerRTEinJavascriptString;
        }
index f4f1ca9..935bec4 100644 (file)
@@ -208,16 +208,12 @@ class tx_rtehtmlarea_inlineelements extends tx_rtehtmlareaapi {
                                $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 721335f..7b956cb 100644 (file)
@@ -123,7 +123,7 @@ BlockElements = HTMLArea.Plugin.extend({
                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 ec2195e..118b505 100644 (file)
@@ -80,9 +80,20 @@ InlineElements = HTMLArea.Plugin.extend({
                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);
                
                /*