Fixed bug #14060: htmlArea RTE: Some table operations configuration may cause js...
authorStanislas Rolland <typo3@sjbr.ca>
Sun, 11 Apr 2010 01:05:55 +0000 (01:05 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Sun, 11 Apr 2010 01:05:55 +0000 (01:05 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7282 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/extensions/TableOperations/class.tx_rtehtmlarea_tableoperations.php

index 1b231b9..f799b31 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@
        * Added feature #14057: htmlArea RTE: Extjize the RTE ajax requests.
        * Added feature #14058: htmlArea RTE: update some WebKit dom methods.
        * Added feature #14059: htmlArea RTE: Cleanup use of editor focus method
+       * Fixed bug #14060: htmlArea RTE: Some table operations configuration may cause js error
 
 2010-04-09  Michael Stucki  <michael@typo3.org>
 
index d10c887..e606788 100644 (file)
@@ -4,6 +4,7 @@
        * Added feature #14057: htmlArea RTE: Extjize the RTE ajax requests.
        * Added feature #14058: htmlArea RTE: update some WebKit dom methods.
        * Added feature #14059: htmlArea RTE: Cleanup use of editor focus method
+       * Fixed bug #14060: htmlArea RTE: Some table operations configuration may cause js error
 
 2010-04-08  Stanislas Rolland  <typo3@sjbr.ca>
 
index b1e9fee..20e41b3 100644 (file)
@@ -114,16 +114,18 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlareaapi {
                        if ($disabledFieldsets) {
                                $dialogues = array('table', 'tableproperties', 'rowproperties', 'columnproperties', 'cellproperties');
                                foreach ($dialogues as $dialogue) {
-                                       if (!is_array( $this->thisConfig['buttons.']) || !is_array( $this->thisConfig['buttons.'][$dialogue.'.'])) {
-                                               $registerRTEinJavascriptString .= '
-                               RTEarea['.$RTEcounter.'].buttons.'.$dialogue.' = new Object();
-                               RTEarea['.$RTEcounter.'].buttons.'.$dialogue.'.removeFieldsets = "' . $disabledFieldsets . '";';
-                                       } else if ($this->thisConfig['buttons.'][$dialogue.'.']['removeFieldsets']) {
-                                               $registerRTEinJavascriptString .= '
-                               RTEarea['.$RTEcounter.'].buttons.'.$dialogue.'.removeFieldsets += ",' . $disabledFieldsets . '";';
-                                       } else {
-                                               $registerRTEinJavascriptString .= '
-                               RTEarea['.$RTEcounter.'].buttons.'.$dialogue.'.removeFieldsets = ",' . $disabledFieldsets . '";';
+                                       if (in_array($dialogue, $this->toolbar)) {
+                                               if (!is_array( $this->thisConfig['buttons.']) || !is_array( $this->thisConfig['buttons.'][$dialogue.'.'])) {
+                                                       $registerRTEinJavascriptString .= '
+                                       RTEarea['.$RTEcounter.'].buttons.'.$dialogue.' = new Object();
+                                       RTEarea['.$RTEcounter.'].buttons.'.$dialogue.'.removeFieldsets = "' . $disabledFieldsets . '";';
+                                               } else if ($this->thisConfig['buttons.'][$dialogue.'.']['removeFieldsets']) {
+                                                       $registerRTEinJavascriptString .= '
+                                       RTEarea['.$RTEcounter.'].buttons.'.$dialogue.'.removeFieldsets += ",' . $disabledFieldsets . '";';
+                                               } else {
+                                                       $registerRTEinJavascriptString .= '
+                                       RTEarea['.$RTEcounter.'].buttons.'.$dialogue.'.removeFieldsets = ",' . $disabledFieldsets . '";';
+                                               }
                                        }
                                }
                        }