Fixed the issue with .text() returning incorrect results.

[jquery.git] / jquery / jquery.js

diff --git a/jquery/jquery.js b/jquery/jquery.js
index 66a3af8..06d7504 100644 (file)
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -13,7 +13,7 @@
 window.undefined = window.undefined;
 
 // Map over the $ in case of overwrite
-if ( $ ) var ._$ = $;
+if ( $ ) var _$ = $;
 
 /**
  * Create a new jQuery Object
@@ -110,11 +110,12 @@ jQuery.fn = jQuery.prototype = {
        text: function(e) {
                e = e || this.get();
                var t = "";
-               for ( var j = 0; j < e.length; j++ )
-                       for ( var i = 0; i < e[j].childNodes.length; i++ )
-                               t += e[j].childNodes[i].nodeType != 1 ?
-                                       e[j].childNodes[i].nodeValue :
-                                       jQuery.fn.text(e[j].childNodes[i].childNodes);
+               for ( var j = 0; j < e.length; j++ ) {
+                       var r = e[j].childNodes;
+                       for ( var i = 0; i < r.length; i++ )
+                               t += r[i].nodeType != 1 ?
+                                       r[i].nodeValue : jQuery.fn.text([ r[i] ]);
+               }
                return t;
        },
        
@@ -751,7 +752,7 @@ jQuery.map = function(a,f) {
        var r = [];
        for ( var i = 0; i < a.length; i++ ) {
                var t = f(a[i],i);
-               if ( t !== null ) {
+               if ( t !== null && t != undefined ) {
                        if ( t.constructor != Array ) t = [t];
                        r = jQuery.merge( t, r );
                }
@@ -804,15 +805,20 @@ jQuery.event = {
        },
        
        handle: function(event) {
-               if ( !event && !window.event ) return;
+               // Handle adding events to items in IFrames, in IE
+               event = event ||
+                       jQuery.event.fix( ((this.ownerDocument || this.document || 
+                               this).parentWindow || window).event );
+
+               // If no correct event was found, fail
+               if ( !event ) return;
        
                var returnValue = true, handlers = [];
-               event = event || jQuery.event.fix(window.event);
        
                for ( var j in this.events[event.type] )
                        handlers[handlers.length] = this.events[event.type][j];
        
-               for ( var i = 0; i < handlers.length; i++ ) {
+               for ( var i = 0; i < handlers.length; i++ )
                        if ( handlers[i].constructor == Function ) {
                                this.handleEvent = handlers[i];
                                if (this.handleEvent(event) === false) {
@@ -821,18 +827,19 @@ jQuery.event = {
                                        returnValue = false;
                                }
                        }
-               }
                return returnValue;
        },
        
        fix: function(event) {
-               event.preventDefault = function() {
-                       this.returnValue = false;
-               };
+               if ( event ) {
+                       event.preventDefault = function() {
+                               this.returnValue = false;
+                       };
                
-               event.stopPropagation = function() {
-                       this.cancelBubble = true;
-               };
+                       event.stopPropagation = function() {
+                               this.cancelBubble = true;
+                       };
+               }
                
                return event;
        }