X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=f6e2adec48a593f38caabd46bd077e810f1427ac;hb=789f0e1093beb559bb2acef708cc4b27c00f557d;hp=50549bb147746532cec8db3ed1f7fa028949121e;hpb=b603ca03c460bad9d8cf367ddc0f18ef46a2ef2d;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 50549bb..f6e2ade 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -528,10 +528,8 @@ jQuery.fn = jQuery.prototype = {
 	/**
 	 * Set the text contents of all matched elements.
 	 *
-	 * Similar to html(), but  escapes HTML (replace "<" and ">" with their
-	 * HTML entities.
-	 *
-	 * If stripTags argument is set to true, HTML is stripped.
+	 * Similar to html(), but escapes HTML (replace "<" and ">" with their
+	 * HTML entities).
 	 *
 	 * @example $("p").text("<b>Some</b> new text.");
 	 * @before <p>Test Paragraph.</p>
@@ -546,23 +544,15 @@ jQuery.fn = jQuery.prototype = {
 	 * @name text
 	 * @type String
 	 * @param String val The text value to set the contents of the element to.
-	 * @param Boolean stripTags (optional) Wheather to strip or only escape tags
 	 * @cat DOM/Attributes
 	 */
-	text: function(e, stripTags) {
-		if ( typeof e == "string" )
-			return this.html( stripTags ? e.replace(/<\/?[^>]+>/gi, '') : e.replace(/</g, "&lt;").replace(/>/g, "&gt;") );
-
-		e = e || this;
-		var t = "";
-		for ( var j = 0, el = e.length; j < el; j++ ) {
-			var r = e[j].childNodes;
-			for ( var i = 0, rl = r.length; i < rl; i++ )
-				if ( r[i].nodeType != 8 )
-					t += r[i].nodeType != 1 ?
-						r[i].nodeValue : jQuery.fn.text([ r[i] ]);
-		}
-		return t;
+	text: function(e) {
+		var type = this.length && this[0].innerText == undefined ?
+			"textContent" : "innerText";
+			
+		return e == undefined ?
+			this.length && this[0][ type ] :
+			this.each(function(){ this[ type ] = e; });
 	},
 
 	/**
@@ -1235,7 +1225,7 @@ jQuery.extend({
 	prop: function(elem, key, value){
 		// Handle executable functions
 		return value.constructor == Function &&
-			value.call( elem, val ) || value;
+			value.call( elem ) || value;
 	},
 
 	className: {