Skip to content
Permalink
Browse files

Fix up whitespace and a couple of glitches.

  • Loading branch information
Yehuda Katz Yehuda Katz
Yehuda Katz authored and Yehuda Katz committed Dec 10, 2009
1 parent b3cee01 commit 1a4d1904ae8631f94b7400d99af24d3fe2f33ecd
Showing with 37 additions and 44 deletions.
  1. +13 −20 src/attributes.js
  2. +3 −3 src/core.js
  3. +5 −5 src/manipulation.js
  4. +10 −10 test/unit/attributes.js
  5. +6 −6 test/unit/manipulation.js
@@ -4,11 +4,11 @@ jQuery.fn.extend({
},

addClass: function( value ) {
if(jQuery.isFunction(value)) {
return this.each(function() {
jQuery(this).addClass( value.call(this) );
});
}
if(jQuery.isFunction(value)) {
return this.each(function() {
jQuery(this).addClass( value.call(this) );
});
}

if ( value && typeof value === "string" ) {
var classNames = (value || "").split(/\s+/);
@@ -35,11 +35,11 @@ jQuery.fn.extend({
},

removeClass: function( value ) {
if(jQuery.isFunction(value)) {
return this.each(function() {
jQuery(this).removeClass( value.call(this) );
});
}
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+/);
@@ -170,13 +170,6 @@ 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
@@ -198,9 +191,9 @@ jQuery.each({
}
}, function(name, fn){
jQuery.fn[ name ] = function(val, state){
if( jQuery.isFunction( val ) ) {
return this.each(function() { jQuery(this)[ name ]( val.call(this), state ); });
}
if( jQuery.isFunction( val ) ) {
return this.each(function() { jQuery(this)[ name ]( val.call(this), state ); });
}

return this.each( fn, arguments );
};
@@ -444,8 +444,8 @@ jQuery.extend({

// not own constructor property must be Object
if ( obj.constructor
&& !hasOwnProperty.call(obj, "constructor")
&& !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
&& !hasOwnProperty.call(obj, "constructor")
&& !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
return false;
}

@@ -481,7 +481,7 @@ jQuery.extend({
script.text = data;
}

// Use insertBefore instead of appendChild to circumvent an IE6 bug.
// Use insertBefore instead of appendChild to circumvent an IE6 bug.
// This arises when a base node is used (#2709).
head.insertBefore( script, head.firstChild );
head.removeChild( script );
@@ -32,11 +32,11 @@ 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(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 ) );
@@ -81,8 +81,8 @@ test("attr(Hash)", function() {
if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
});
ok( pass, "Set Multiple Attributes" );
equals( jQuery('#text1').attr({'value': function() { return this.id; }})[0].value, "text1", "Set attribute to computed value #1" );
equals( jQuery('#text1').attr({'title': function(i) { return i; }}).attr('title'), "0", "Set attribute to computed value #2");
equals( jQuery('#text1').attr({'value': function() { return this.id; }})[0].value, "text1", "Set attribute to computed value #1" );
equals( jQuery('#text1').attr({'title': function(i) { return i; }}).attr('title'), "0", "Set attribute to computed value #2");

});

@@ -314,11 +314,11 @@ var testAddClass = function(valueObj) {
}

test("addClass(String)", function() {
testAddClass(bareObj);
testAddClass(bareObj);
});

test("addClass(Function)", function() {
testAddClass(functionReturningObj);
testAddClass(functionReturningObj);
});

var testRemoveClass = function(valueObj) {
@@ -355,11 +355,11 @@ var testRemoveClass = function(valueObj) {
};

test("removeClass(String) - simple", function() {
testRemoveClass(bareObj);
testRemoveClass(bareObj);
});

test("removeClass(Function) - simple", function() {
testRemoveClass(functionReturningObj);
testRemoveClass(functionReturningObj);
});

var testToggleClass = function(valueObj) {
@@ -415,11 +415,11 @@ var testToggleClass = function(valueObj) {
};

test("toggleClass(String|boolean|undefined[, boolean])", function() {
testToggleClass(bareObj);
testToggleClass(bareObj);
});

test("toggleClass(Function[, boolean])", function() {
testToggleClass(functionReturningObj);
testToggleClass(functionReturningObj);
});

var testRemoveAttr = function(valueObj) {
@@ -428,11 +428,11 @@ var testRemoveAttr = function(valueObj) {
};

test("removeAttr(String)", function() {
testRemoveAttr(bareObj);
testRemoveAttr(bareObj);
});

test("removeAttr(Function)", function() {
testRemoveAttr(functionReturningObj);
testRemoveAttr(functionReturningObj);
});

test("addClass, removeClass, hasClass", function() {
@@ -105,7 +105,7 @@ test("wrapAll(String|Element)", function() {

// TODO: Figure out why each(wrapAll) is not equivalent to wrapAll
// test("wrapAll(Function)", function() {
// testWrapAll(functionReturningObj);
// testWrapAll(functionReturningObj);
// })

var testWrapInner = function(val) {
@@ -130,7 +130,7 @@ test("wrapInner(String|Element)", function() {

// TODO: wrapInner uses wrapAll -- get wrapAll working with Function
// test("wrapInner(Function)", function() {
// testWrapInner(functionReturningObj)
// testWrapInner(functionReturningObj)
// })

var testUnwrap = function() {
@@ -251,7 +251,7 @@ var testAppend = function(valueObj) {
}

test("append(String|Element|Array<Element>|jQuery)", function() {
testAppend(bareObj);
testAppend(bareObj);
});

test("append(Function)", function() {
@@ -658,9 +658,9 @@ var testVal = function(valueObj) {
jQuery("#select1").val(valueObj( 2 ));
equals( jQuery("#select1").val(), "2", "Check for modified (via val(Number)) value of select element" );

jQuery("#select1").append("<option value='4'>four</option>");
jQuery("#select1").val(valueObj( 4 ));
equals( jQuery("#select1").val(), "4", "Should be possible to set the val() to a newly created option" );
jQuery("#select1").append("<option value='4'>four</option>");
jQuery("#select1").val(valueObj( 4 ));
equals( jQuery("#select1").val(), "4", "Should be possible to set the val() to a newly created option" );

// using contents will get comments regular, text, and comment nodes
var j = jQuery("#nonnodes").contents();

0 comments on commit 1a4d190

Please sign in to comment.
You can’t perform that action at this time.