Fixed bug #14723: htmlArea RTE: JS errors block RTE usage in IE6 and IE7 (Thanks...
authorStanislas Rolland <typo3@sjbr.ca>
Tue, 15 Jun 2010 01:21:32 +0000 (01:21 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Tue, 15 Jun 2010 01:21:32 +0000 (01:21 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7926 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
typo3/sysext/rtehtmlarea/htmlarea/plugins/DefaultImage/default-image.js
typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js

index 310d7a2..96b9aac 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-14  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #14723: htmlArea RTE: JS errors block RTE usage in IE6 and IE7 (Thanks to Jo Hasenau)
+
 2010-06-14  Peter Niederlag  <netservice@niekom.de>
 
        * Cleanup, #14660: add hint on required rewrite for compression in config_default.php
index 5f58ed9..4e73e78 100644 (file)
@@ -1,3 +1,7 @@
+2010-06-14  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #14723: htmlArea RTE: JS errors block RTE usage in IE6 and IE7 (Thanks to Jo Hasenau)
+
 2010-06-10  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Follow-up to issue #14662: htmlArea RTE: Should use t3lib_utility_Client::getBrowserInfo
index 281a442..0a4987d 100644 (file)
@@ -893,11 +893,11 @@ HTMLArea.Iframe = Ext.extend(Ext.BoxComponent, {
                        // All browsers
                if (!iframe || (!iframe.contentWindow && !iframe.contentDocument)) {
                        this.initializeIframe.defer(50, this);
-                       // All except Safari
+                       // All except WebKit
                } else if (iframe.contentWindow && !Ext.isWebKit && (!iframe.contentWindow.document || !iframe.contentWindow.document.documentElement)) {
                        this.initializeIframe.defer(50, this);
-                       // Safari
-               } else if (!iframe.contentDocument.documentElement || !iframe.contentDocument.body) {
+                       // WebKit
+               } else if (Ext.isWebKit && (!iframe.contentDocument.documentElement || !iframe.contentDocument.body)) {
                        this.initializeIframe.defer(50, this);
                } else {
                        this.document = iframe.contentWindow ? iframe.contentWindow.document : iframe.contentDocument;
index 13d4cc8..ea1db45 100644 (file)
@@ -312,7 +312,7 @@ HTMLArea.DefaultImage = HTMLArea.Plugin.extend({
                                                                        ]
                                                                }),
                                                                hidden: this.removeItems.test('align'),
-                                                               hideLabel: this.removeItems.test('align'),
+                                                               hideLabel: this.removeItems.test('align')
                                                                }, this.configDefaults['combo'])
                                                        ,{
                                                                itemId: 'border',
index d1ca3cb..ff1c64c 100644 (file)
@@ -1896,7 +1896,7 @@ HTMLArea.TableOperations = HTMLArea.Plugin.extend({
                                autoDestroy:  true,
                                fields: [ { name: 'text'}, { name: 'value'}, { name: 'style'} ],
                                data: [[this.localize('No block style'), 'none']]
-                       }),
+                       })
                        }, {
                        tpl: '<tpl for="."><div ext:qtip="{value}" style="{style}text-align:left;font-size:11px;" class="x-combo-list-item">{text}</div></tpl>'
                        }, this.configDefaults['combo']