From 1a4d1904ae8631f94b7400d99af24d3fe2f33ecd Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Wed, 9 Dec 2009 21:15:49 -0800
Subject: [PATCH] Fix up whitespace and a couple of glitches.
---
src/attributes.js | 33 +++++++++++++--------------------
src/core.js | 6 +++---
src/manipulation.js | 10 +++++-----
test/unit/attributes.js | 20 ++++++++++----------
test/unit/manipulation.js | 12 ++++++------
5 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/src/attributes.js b/src/attributes.js
index 8d889fc..8080af8 100644
--- a/src/attributes.js
+++ b/src/attributes.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 );
};
diff --git a/src/core.js b/src/core.js
index 7543b8c..5f1bc3a 100644
--- a/src/core.js
+++ b/src/core.js
@@ -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 );
diff --git a/src/manipulation.js b/src/manipulation.js
index baab8c6..17cfa84 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -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 ) );
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index a95b3f9..6b18f99 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -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() {
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 8c3d1a5..03f8f32 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -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();
--
1.7.10.4