From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Thu, 10 Dec 2009 04:57:19 +0000 (-0800)
Subject: Add function values to addClass, removeClass, toggleClass, text, and removeAttr
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=da51cd0e43d6d61e0d3d6c197cef1e658bad29bc;p=jquery.git
Add function values to addClass, removeClass, toggleClass, text, and removeAttr
---
diff --git a/src/attributes.js b/src/attributes.js
index 4405b43..8d889fc 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -4,6 +4,12 @@ jQuery.fn.extend({
},
addClass: function( value ) {
+ if(jQuery.isFunction(value)) {
+ return this.each(function() {
+ jQuery(this).addClass( value.call(this) );
+ });
+ }
+
if ( value && typeof value === "string" ) {
var classNames = (value || "").split(/\s+/);
@@ -29,6 +35,12 @@ jQuery.fn.extend({
},
removeClass: function( value ) {
+ if(jQuery.isFunction(value)) {
+ return this.each(function() {
+ jQuery(this).removeClass( value.call(this) );
+ });
+ }
+
if ( (value && typeof value === "string") || value === undefined ) {
var classNames = (value || "").split(/\s+/);
@@ -113,7 +125,7 @@ jQuery.fn.extend({
// Typecast once if the value is a number
if ( typeof value === "number" ) {
value += '';
- }
+ }
var val = value;
return this.each(function(){
@@ -122,10 +134,10 @@ jQuery.fn.extend({
// Typecast each time if the value is a Function and the appended
// value is therefore different each time.
if( typeof val === "number" ) {
- val += '';
+ val += '';
}
}
-
+
if ( this.nodeType != 1 ) {
return;
}
@@ -158,6 +170,13 @@ jQuery.each({
},
toggleClass: function( classNames, state ) {
+ if( jQuery.isFunction(classNames) ) {
+ return this.each(function() {
+ console.log(this);
+ jQuery(this).toggleClass( classNames.call(this), state );
+ });
+ }
+
var type = typeof classNames;
if ( type === "string" ) {
// toggle individual class names
@@ -178,7 +197,11 @@ jQuery.each({
}
}
}, function(name, fn){
- jQuery.fn[ name ] = function(){
+ jQuery.fn[ name ] = function(val, state){
+ if( jQuery.isFunction( val ) ) {
+ return this.each(function() { jQuery(this)[ name ]( val.call(this), state ); });
+ }
+
return this.each( fn, arguments );
};
});
@@ -192,7 +215,7 @@ jQuery.extend({
if ( name in jQuery.fn && name !== "attr" ) {
return jQuery(elem)[name](value);
}
-
+
var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
// Whether we are setting (or getting)
set = value !== undefined;
diff --git a/src/manipulation.js b/src/manipulation.js
index 930b3d9..baab8c6 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -32,6 +32,12 @@ if ( !jQuery.support.htmlSerialize ) {
jQuery.fn.extend({
text: function( text ) {
+ if(jQuery.isFunction(text)) {
+ return this.each(function() {
+ return jQuery(this).text( text.call(this) );
+ });
+ }
+
if ( typeof text !== "object" && text !== undefined ) {
return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
}
@@ -87,7 +93,7 @@ jQuery.fn.extend({
}
}).end();
},
-
+
append: function() {
return this.domManip(arguments, true, function(elem){
if ( this.nodeType === 1 ) {
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index e0425c4..a95b3f9 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -1,5 +1,8 @@
module("attributes");
+var bareObj = function(value) { return value; };
+var functionReturningObj = function(value) { return (function() { return value; }); };
+
test("attr(String)", function() {
expect(28);
@@ -294,10 +297,10 @@ test("attr('tabindex', value)", function() {
equals(element.attr('tabindex'), -1, 'set negative tabindex');
});
-test("addClass(String)", function() {
+var testAddClass = function(valueObj) {
expect(2);
var div = jQuery("div");
- div.addClass("test");
+ div.addClass( valueObj("test") );
var pass = true;
for ( var i = 0; i < div.size(); i++ ) {
if ( div.get(i).className.indexOf("test") == -1 ) pass = false;
@@ -306,16 +309,24 @@ test("addClass(String)", function() {
// using contents will get regular, text, and comment nodes
var j = jQuery("#nonnodes").contents();
- j.addClass("asdf");
+ j.addClass( valueObj("asdf") );
ok( j.hasClass("asdf"), "Check node,textnode,comment for addClass" );
+}
+
+test("addClass(String)", function() {
+ testAddClass(bareObj);
});
-test("removeClass(String) - simple", function() {
+test("addClass(Function)", function() {
+ testAddClass(functionReturningObj);
+});
+
+var testRemoveClass = function(valueObj) {
expect(5);
var $divs = jQuery('div');
- $divs.addClass("test").removeClass("test");
+ $divs.addClass("test").removeClass( valueObj("test") );
ok( !$divs.is('.test'), "Remove Class" );
@@ -323,7 +334,7 @@ test("removeClass(String) - simple", function() {
$divs = jQuery('div');
$divs.addClass("test").addClass("foo").addClass("bar");
- $divs.removeClass("test").removeClass("bar").removeClass("foo");
+ $divs.removeClass( valueObj("test") ).removeClass( valueObj("bar") ).removeClass( valueObj("foo") );
ok( !$divs.is('.test,.bar,.foo'), "Remove multiple classes" );
@@ -331,42 +342,50 @@ test("removeClass(String) - simple", function() {
$divs = jQuery('div');
// Make sure that a null value doesn't cause problems
- $divs.eq(0).addClass("test").removeClass(null);
+ $divs.eq(0).addClass("test").removeClass( valueObj(null) );
ok( $divs.eq(0).is('.test'), "Null value passed to removeClass" );
- $divs.eq(0).addClass("test").removeClass("");
+ $divs.eq(0).addClass("test").removeClass( valueObj("") );
ok( $divs.eq(0).is('.test'), "Empty string passed to removeClass" );
// using contents will get regular, text, and comment nodes
var j = jQuery("#nonnodes").contents();
- j.removeClass("asdf");
+ j.removeClass( valueObj("asdf") );
ok( !j.hasClass("asdf"), "Check node,textnode,comment for removeClass" );
+};
+
+test("removeClass(String) - simple", function() {
+ testRemoveClass(bareObj);
});
-test("toggleClass(String|boolean|undefined[, boolean])", function() {
+test("removeClass(Function) - simple", function() {
+ testRemoveClass(functionReturningObj);
+});
+
+var testToggleClass = function(valueObj) {
expect(17);
var e = jQuery("#firstp");
ok( !e.is(".test"), "Assert class not present" );
- e.toggleClass("test");
+ e.toggleClass( valueObj("test") );
ok( e.is(".test"), "Assert class present" );
- e.toggleClass("test");
+ e.toggleClass( valueObj("test") );
ok( !e.is(".test"), "Assert class not present" );
// class name with a boolean
- e.toggleClass("test", false);
+ e.toggleClass( valueObj("test"), false );
ok( !e.is(".test"), "Assert class not present" );
- e.toggleClass("test", true);
+ e.toggleClass( valueObj("test"), true );
ok( e.is(".test"), "Assert class present" );
- e.toggleClass("test", false);
+ e.toggleClass( valueObj("test"), false );
ok( !e.is(".test"), "Assert class not present" );
// multiple class names
e.addClass("testA testB");
ok( (e.is(".testA.testB")), "Assert 2 different classes present" );
- e.toggleClass("testB testC");
+ e.toggleClass( valueObj("testB testC") );
ok( (e.is(".testA.testC") && !e.is(".testB")), "Assert 1 class added, 1 class removed, and 1 class kept" );
- e.toggleClass("testA testC");
+ e.toggleClass( valueObj("testA testC") );
ok( (!e.is(".testA") && !e.is(".testB") && !e.is(".testC")), "Assert no class present" );
// toggleClass storage
@@ -393,11 +412,27 @@ test("toggleClass(String|boolean|undefined[, boolean])", function() {
// Cleanup
e.removeClass("testD");
e.removeData('__className__');
+};
+
+test("toggleClass(String|boolean|undefined[, boolean])", function() {
+ testToggleClass(bareObj);
});
-test("removeAttr(String", function() {
+test("toggleClass(Function[, boolean])", function() {
+ testToggleClass(functionReturningObj);
+});
+
+var testRemoveAttr = function(valueObj) {
expect(1);
- equals( jQuery('#mark').removeAttr("class")[0].className, "", "remove class" );
+ equals( jQuery('#mark').removeAttr( valueObj("class") )[0].className, "", "remove class" );
+};
+
+test("removeAttr(String)", function() {
+ testRemoveAttr(bareObj);
+});
+
+test("removeAttr(Function)", function() {
+ testRemoveAttr(functionReturningObj);
});
test("addClass, removeClass, hasClass", function() {
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 6de3e14..8c3d1a5 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -739,15 +739,16 @@ test("html(String)", function() {
test("html(Function)", function() {
testHtml(functionReturningObj);
-})
+});
var testText = function(valueObj) {
expect(4);
- equals( jQuery("#foo").text("<div><b>Hello</b> cruel world!</div>")[0].innerHTML.replace(/>/g, ">"), "<div><b>Hello</b> cruel world!</div>", "Check escaped text" );
+ var val = valueObj("<div><b>Hello</b> cruel world!</div>");
+ equals( jQuery("#foo").text(val)[0].innerHTML.replace(/>/g, ">"), "<div><b>Hello</b> cruel world!</div>", "Check escaped text" );
// using contents will get comments regular, text, and comment nodes
var j = jQuery("#nonnodes").contents();
- j.text("hi!");
+ j.text(valueObj("hi!"));
equals( jQuery(j[0]).text(), "hi!", "Check node,textnode,comment with text()" );
equals( j[1].nodeValue, " there ", "Check node,textnode,comment with text()" );
equals( j[2].nodeType, 8, "Check node,textnode,comment with text()" );