Fixed bug #10479: htmlArea RTE: JS error is raised when using the delete icon on...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5032 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index e34a4b9..c81a46b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-18  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #10479: htmlArea RTE: JS error is raised when using the delete icon on a flexform
+

 2009-02-18  Oliver Hader  <oliver@typo3.org>
 
        * Fixed bug #10452: Evaluation PATH_INFO in tslib_fe::checkAlternativeIdMethods() sets false positives and should be moved to tx_simulatestatic
 2009-02-18  Oliver Hader  <oliver@typo3.org>
 
        * Fixed bug #10452: Evaluation PATH_INFO in tslib_fe::checkAlternativeIdMethods() sets false positives and should be moved to tx_simulatestatic

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 2224716..4762338 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-18  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #10479: htmlArea RTE: JS error is raised when using the delete icon on a flexform
+

 2009-02-12  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #10428: htmlArea RTE: Remove configuration variables related to Mozilla clipboard access
 2009-02-12  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #10428: htmlArea RTE: Remove configuration variables related to Mozilla clipboard access

diff --git a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
index 4d211f5..d673195 100644 (file)
--- a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
+++ b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
@@ -1462,7 +1462,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
         * @return      string          Javascript code
         */
        function setSaveRTE($RTEcounter, $formName, $textareaId) {
         * @return      string          Javascript code
         */
        function setSaveRTE($RTEcounter, $formName, $textareaId) {

-               return 'if (RTEarea[\'' . $textareaId . '\']) { document.' . $formName . '[\'' . $textareaId . '\'].value = RTEarea[\'' . $textareaId . '\'][\'editor\'].getHTML(); } else { OK = 0; };';
+               return 'if (RTEarea["' . $textareaId . '"]) { document.' . $formName . '["' . $textareaId . '"].value = RTEarea["' . $textareaId . '"].editor.getPluginInstance("EditorMode").getHTML(); } else { OK = 0; };';

        }
 
        /**
        }
 
        /**


@@ -1476,7 +1476,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
         * @return      string          Javascript code
         */
        function setDeleteRTE($RTEcounter, $formName, $textareaId) {
         * @return      string          Javascript code
         */
        function setDeleteRTE($RTEcounter, $formName, $textareaId) {

-               return 'if (RTEarea[\'' . $textareaId . '\']) { RTEarea[\'' . $textareaId . '\'].deleted = true;}';
+               return 'if (RTEarea["' . $textareaId . '"]) { RTEarea["' . $textareaId . '"].deleted = true;}';

        }
 
        /**
        }
 
        /**