Changeset 4294

Timestamp:

12/21/07 09:52:34 (1 year ago)

Author:

joern.zaefferer

Message:

 

Location:

trunk/plugins/accordion

Files:

• lib/jquery.js (modified) (9 diffs)
• test/leak.html (modified) (2 diffs)

trunk/plugins/accordion/lib/jquery.js

@@ -7 +7 @@
  * and GPL (GPL-LICENSE.txt) licenses.
  *
- * $Date: 2007-12-20 14:36:56 +0100 (Don, 20 Dez 2007) $
- * $Rev: 4251 $
+ * $Date: 2007-12-21 06:47:33 +0100 (Fre, 21 Dez 2007) $
+ * $Rev: 4293 $
  */
 
@@ -325 +325 @@
         if ( events === true )
             this.find("*").andSelf().each(function(i){
+                if (this.nodeType == 3)
+                    return;
                 var events = jQuery.data( this, "events" );
 
@@ -934 +936 @@
                 // Fix "XHTML"-style tags in all browsers
                 elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
-                    return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area)$/i) ?
+                    return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
                         all :
                         front + "></" + tag + ">";
@@ -1841 +1843 @@
                     return val;
         
-                val = jQuery.event.handle.apply(elem, arguments);
+                val = jQuery.event.handle.apply(arguments.callee.elem, arguments);
         
                 return val;
             });
+        // Add elem as a property of the handle function
+        // This is to prevent a memory leak with non-native
+        // event in IE.
+        handle.elem = elem;
             
             // Handle multiple events seperated by a space
@@ -1879 +1885 @@
                 jQuery.event.global[type] = true;
             });
+        
+        // Nullify elem to prevent memory leaks in IE
+        elem = null;
     },
 
@@ -1942 +1951 @@
             for ( ret in events ) break;
             if ( !ret ) {
+                var handle = jQuery.data( elem, "handle" );
+                if ( handle ) handle.elem = null;
                 jQuery.removeData( elem, "events" );
                 jQuery.removeData( elem, "handle" );
@@ -2055 +2066 @@
 
     fix: function(event) {
-        // Short-circuit if the event has already been fixed by jQuery.event.fix
-        if ( event[ expando ] )
-            return event;
-            
         // store a copy of the original event object 
         // and clone to set read-only properties
         var originalEvent = event;
         event = jQuery.extend({}, originalEvent);
-        
-        // Mark the event as fixed by jQuery.event.fix
-        event[ expando ] = true;
         
         // add preventDefault and stopPropagation since 
@@ -2270 +2274 @@
         
             // Trigger any bound ready events
-            $(document).triggerHandler("ready");
+            jQuery(document).triggerHandler("ready");
         }
     }
@@ -2983 +2987 @@
 
         return this.each(function(){
-            if ( this.nodeType != 1)
-                return;
-
             if ( fn.constructor == Array )
                 queue(this, type, fn);

trunk/plugins/accordion/test/leak.html

@@ -7 +7 @@
     <link rel="stylesheet" href="../demo/demo.css" />
     <script type="text/javascript" src="../lib/jquery.js"></script>
+    <script type="text/javascript" src="../lib/jquery.dimensions.js"></script>
     <script type="text/javascript">
+    $.fn.extend({
+        leak: function() {
+            var container = this;
+            return this.bind("click", function clickHandler() {});
+        }
+    });
+    
     $(function() {
-        // leaks like hell in IE
-        jQuery('#list2').change(function() {});
+        jQuery('#list2')
+            .leak()
+            .change(function() {});
     });
     </script>
@@ -18 +27 @@
 
         <dl id="list2">
+            <dt class="red">Red</dt>
+            <dd>
+                Fancy stuff about red thingies.
+            </dd>
+            <dt class="green selected">Green</dt>
+            <dd>
+                Green! Green! Green!
+            </dd>
+            <dt class="blue">Blue</dt>
+            <dd>
+                Cool kids are blue.
+            </dd>
         </dl>
     </body>