X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=8e370f8ed8ca6fd0ecca6bff00327bc836a54d6b;hb=42f30dd1812fc0ee262eaa43f0a354d8e439938c;hp=5e2864b3159d0110c99fbd8515bc5d42a12b1ab0;hpb=cb3f9d8cd92ae1e5cf97684c907ebed893ca778b;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 5e2864b..8e370f8 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -565,7 +565,7 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Attributes
 	 */
 	text: function(e) {
-		if ( typeof e == "string" )
+		if ( typeof e != "object" && e != null )
 			return this.empty().append( document.createTextNode( e ) );
 
 		var t = "";
@@ -1666,11 +1666,15 @@ jQuery.extend({
 	unique: function(first) {
 		var r = [], num = jQuery.mergeNum++;
 
-		for ( var i = 0, fl = first.length; i < fl; i++ )
-			if ( num != first[i].mergeNum ) {
-				first[i].mergeNum = num;
-				r.push(first[i]);
-			}
+		try {
+			for ( var i = 0, fl = first.length; i < fl; i++ )
+				if ( num != first[i].mergeNum ) {
+					first[i].mergeNum = num;
+					r.push(first[i]);
+				}
+		} catch(e) {
+			r = first;
+		}
 
 		return r;
 	},