X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=2f3bc02e53442634c85ceb08d9b86f4abddd14fc;hb=a2482e5e87558edb2be67fd6e7369bb62168fde9;hp=1d0d281339910d9b832d65fef9a8438536429cda;hpb=b9a8e65576615974228e493155c8c85dc25f09d8;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 1d0d281..2f3bc02 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 = "";
@@ -811,7 +811,7 @@ jQuery.fn = jQuery.prototype = {
 
 	/**
 	 * Searches for all elements that match the specified expression.
-	 
+	 * 
 	 * This method is a good way to find additional descendant
 	 * elements with which to process.
 	 *
@@ -1607,7 +1607,7 @@ jQuery.extend({
 	 * @cat JavaScript
 	 */
 	trim: function(t){
-		return t.replace(/^\s+|\s+$/g, "");
+		return (t||"").replace(/^\s+|\s+$/g, "");
 	},
 
 	makeArray: function( a ) {
@@ -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;
 	},
@@ -1811,7 +1815,7 @@ new function() {
 
 	// Figure out what browser is being used
 	jQuery.browser = {
-		version: b.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)[1],
+		version: (b.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/) || [])[1],
 		safari: /webkit/.test(b),
 		opera: /opera/.test(b),
 		msie: /msie/.test(b) && !/opera/.test(b),