Changeset 533

Timestamp:

07/22/06 13:31:22 (7 years ago)

Author:

mokhet

Message:

enhance HTMLArea.free(). Take care of hidden TD which are leaking in IE and innerHTML property which must not be null but blank instead

Files:

• trunk/htmlarea.js (modified) (2 diffs)

trunk/htmlarea.js

@@ -200 +200 @@
       panels[i].container.className = 'panels ' + i;
       HTMLArea.freeLater(panels[i], 'container');
-      HTMLArea.freeLater(panels[i], 'div');      
+      HTMLArea.freeLater(panels[i], 'div');
     }
     // finally store the variable
     this._panels = panels;
-    
+
     HTMLArea.freeLater(this, '_textArea');
   }
@@ -6712 +6712 @@
 };
 
-HTMLArea.free = function(obj, prop)
-{
-  if ( obj && !prop )
-  {
-    for ( var p in obj )
-    {
-      HTMLArea.free(obj, p);
-    }
-  }
-  else if ( obj )
-  {
+/**
+ * Release memory properties from object
+ * @param {object} O (Object)   The object to free memory
+ * @param (string} P (Property) The property to release (optional)
+ * @private
+ */
+HTMLArea.free = function(O, P)
+{
+  if ( O && !P )
+  {
+    for ( var p in O )
+    {
+      HTMLArea.free(O, p);
+    }
+  }
+  else if ( O )
+  {
+    // is the try...catch really required here ?
     try
     {
-      obj[prop] = null;
-    } catch(ex) {}
+      // if the property is innerHTML, null can't be used because it is interpreted as null.toString()
+      // we need to blank it instead
+      if ( P == 'innerHTML' )
+      {
+        O[P] = '';
+      }
+      else
+      {
+        // need to unhide TD cells before delete them or they will leak in IE
+        if ( P && O[P] && O[P].tagName && O[P].tagName.toLowerCase() == 'td' )
+        {
+          O[P].style.display = '';
+        }
+        O[P] = null;
+      }
+    } catch(x) {}
   }
 };