Follow-up to bug #14413: htmlArea RTE: ExtJS resources are not released in IE when...
authorStanislas Rolland <typo3@sjbr.ca>
Thu, 20 May 2010 03:24:32 +0000 (03:24 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Thu, 20 May 2010 03:24:32 +0000 (03:24 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7643 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js

index 177fffc..85a79b7 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-19  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Follow-up to bug #14413: htmlArea RTE: ExtJS resources are not released in IE when RTE closes
+
 2010-05-18  Benjamin Mack  <benni@typo3.org>
 
        * Follow-up to #14277: Removed redundant code / Improve t3lib_compressor
index 6bf7eb6..6cb773c 100644 (file)
@@ -1,3 +1,7 @@
+2010-05-19  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Follow-up to bug #14413: htmlArea RTE: ExtJS resources are not released in IE when RTE closes
+
 2010-05-17  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug 14413: htmlArea RTE: ExtJS resources are not released in IE when RTE closes
index 02f8268..79aec5b 100644 (file)
@@ -1369,11 +1369,11 @@ HTMLArea.Iframe = Ext.extend(Ext.BoxComponent, {
                        // Nullify EXTJS private handlers
                Ext.each(this.keyMap.bindings, function (binding, index) {
                        this.keyMap.bindings[index] = null;
-               });
+               }, this);
                this.keyMap.handleKeyDown = null;
                Ext.each(this.hotKeyMap.bindings, function (binding, index) {
                        this.hotKeyMap.bindings[index] = null;
-               });
+               }, this);
                this.hotKeyMap.handleKeyDown = null;
                this.keyMap.disable();
                this.hotKeyMap.disable();
@@ -2113,7 +2113,7 @@ HTMLArea.Framework = Ext.extend(Ext.Panel, {
                        // If the textarea is inside a form, on reset, re-initialize the HTMLArea content and update the toolbar
                var form = this.textArea.dom.form;
                if (form) {
-                       if (Ext.isFunction(form.onsubmit)) {
+                       if (Ext.isFunction(form.onreset)) {
                                if (typeof(form.htmlAreaPreviousOnReset) == 'undefined') {
                                        form.htmlAreaPreviousOnReset = [];
                                }
@@ -2126,7 +2126,8 @@ HTMLArea.Framework = Ext.extend(Ext.Panel, {
                                fn: this.onFrameworkResize
                        },
                        beforedestroy: {
-                               fn: this.onBeforeDestroy
+                               fn: this.onBeforeDestroy,
+                               single: true
                        }
                });
        },
@@ -2739,12 +2740,12 @@ HTMLArea.Editor = Ext.extend(Ext.util.Observable, {
                Ext.iterate(this.plugins, function (pluginId) {
                        this.unRegisterPlugin(pluginId);
                }, this);
-               this.purgeListeners()
+               this.purgeListeners();
                        // Cleaning references to DOM in order to avoid IE memory leaks
                this.wizards.dom = null;
                this.textArea.parent().parent().dom = null;
                this.textArea.parent().dom = null;
-               this.textArea.dom = null;;
+               this.textArea.dom = null;
                RTEarea[this.editorId].editor = null;
        }
 });