Fixed bug #16975: htmlArea RTE: Use parentNode rather than parentElement

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

diff --git a/ChangeLog b/ChangeLog
index 501d308..505c695 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
 
        * Fixed bug #17140: htmlArea RTE: In WebKit, RTE inserts incorrect link if text is double-clicked
        * Updated htmlArea RTE version to 2.1.5
+       * Fixed bug #16975: htmlArea RTE: Use parentNode rather than parentElement
 
 2011-01-21  Susanne Moog  <typo3@susanne-moog.de>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 4a965cf..adb4022 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-21  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #16975: htmlArea RTE: Use parentNode rather than parentElement
+
 2011-01-20  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #17140: htmlArea RTE: In WebKit, RTE inserts incorrect link if text is double-clicked

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js
index df0c23a..d49b6b8 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js
@@ -1060,7 +1060,7 @@ HTMLArea.TableOperations = HTMLArea.Plugin.extend({
                                        });
                                        break;
                                }
-                               var tr = cell.parentElement;
+                               var tr = cell.parentNode;
                                var no_cols = parseInt(prompt(this.localize("How many columns would you like to merge?"), 2));
                                if (!no_cols) break;
                                var no_rows = parseInt(prompt(this.localize("How many rows would you like to merge?"), 2));