Fixed bug #15121: htmlArea RTE: Javascript Error in IE7 prevent Link dialogue from...

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

diff --git a/ChangeLog b/ChangeLog
index bcb1df9..7922a88 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 
        * Fixed bug #15244: htmlArea RTE: textearea Id may not be unique in FE
        * Fixed bug #15250: htmlArea RTE: FE additionalJS_post javascript may be displayed as HTML text
+       * Fixed bug #15121: htmlArea RTE: Javascript Error in IE7 prevent Link dialogue from opening
 
 2010-07-27  Xavier Perseguers  <typo3@perseguers.ch>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 0b45efb..8eaed06 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -2,6 +2,7 @@
 
        * Fixed bug #15244: htmlArea RTE: textearea Id may not be unique in FE
        * Fixed bug #15250: htmlArea RTE: FE additionalJS_post javascript may be displayed as HTML text
+       * Fixed bug #15121: htmlArea RTE: Javascript Error in IE7 prevent Link dialogue from opening
 
 2010-07-26  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Link/typo3link.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Link/typo3link.js
index a243d7e..b129bdf 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Link/typo3link.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Link/typo3link.js
@@ -146,7 +146,8 @@ HTMLArea.TYPO3Link = HTMLArea.Plugin.extend({
                                if (this.pageTSConfiguration && this.pageTSConfiguration.additionalAttributes) {
                                        var additionalAttributes = this.pageTSConfiguration.additionalAttributes.split(",");
                                        for (var i = additionalAttributes.length; --i >= 0;) {
-                                               if (node.hasAttribute(additionalAttributes[i])) {
+                                                       // hasAttribute() not available in IE < 8
+                                               if ((node.hasAttribute && node.hasAttribute(additionalAttributes[i])) || node.getAttribute(additionalAttributes[i]) != null) {
                                                        additionalParameter += "&curUrl[" + additionalAttributes[i] + "]=" + encodeURIComponent(node.getAttribute(additionalAttributes[i]));
                                                }
                                        }