Index: typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js (revision 7925)
+++ typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js (working copy)
@@ -897,8 +897,10 @@
} 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) {
- this.initializeIframe.defer(50, this);
+ } else if (Ext.isWebKit) {
+ if (!iframe.contentDocument.documentElement || !iframe.contentDocument.body) {
+ this.initializeIframe.defer(50, this);
+ }
} else {
this.document = iframe.contentWindow ? iframe.contentWindow.document : iframe.contentDocument;
this.getEditor().document = this.document;
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js (revision 7925)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js (working copy)
@@ -1896,7 +1896,7 @@
autoDestroy: true,
fields: [ { name: 'text'}, { name: 'value'}, { name: 'style'} ],
data: [[this.localize('No block style'), 'none']]
- }),
+ })
}, {
tpl: '{text}
'
}, this.configDefaults['combo']
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/DefaultImage/default-image.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/DefaultImage/default-image.js (revision 7925)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/DefaultImage/default-image.js (working copy)
@@ -312,7 +312,7 @@
]
}),
hidden: this.removeItems.test('align'),
- hideLabel: this.removeItems.test('align'),
+ hideLabel: this.removeItems.test('align')
}, this.configDefaults['combo'])
,{
itemId: 'border',