Skip to content

Commit 14eba98

Browse files
markelogmarkelog
committed
Build: code style fixes after all those reverts
1 parent c9546c6 commit 14eba98

30 files changed

+1037
-1005
lines changed

‎src/ajax/load.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ define( [
55
"../traversing",
66
"../manipulation",
77
"../selector",
8+
89
// Optional event/alias dependency
910
"../event/alias"
1011
], function( jQuery ) {

‎src/core.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ jQuery.extend( {
290290
// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
291291
globalEval: function( data ) {
292292
if ( data && jQuery.trim( data ) ) {
293+
293294
// We use execScript on Internet Explorer
294295
// We use an anonymous function so that context is window
295296
// rather than jQuery in Firefox

‎src/core/init.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ var rootjQuery,
7979

8080
// Inject the element directly into the jQuery object
8181
this.length = 1;
82-
this[0] = elem;
82+
this[ 0 ] = elem;
8383
}
8484

8585
this.context = document;
@@ -99,7 +99,7 @@ var rootjQuery,
9999

100100
// HANDLE: $(DOMElement)
101101
} else if ( selector.nodeType ) {
102-
this.context = this[0] = selector;
102+
this.context = this[ 0 ] = selector;
103103
this.length = 1;
104104
return this;
105105

‎src/css.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ function showHide( elements, show ) {
8282
values[ index ] = jQuery._data( elem, "olddisplay" );
8383
display = elem.style.display;
8484
if ( show ) {
85+
8586
// Reset the inline display of this element to learn if it is
8687
// being hidden by cascaded rules or not
8788
if ( !values[ index ] && display === "none" ) {
@@ -92,7 +93,7 @@ function showHide( elements, show ) {
9293
// in a stylesheet to whatever the default browser style is
9394
// for such an element
9495
if ( elem.style.display === "" && isHidden( elem ) ) {
95-
values[ index ] = jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
96+
values[ index ] = jQuery._data( elem, "olddisplay", defaultDisplay( elem.nodeName ) );
9697
}
9798
} else {
9899
hidden = isHidden( elem );

‎src/css/defaultDisplay.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
define([
1+
define( [
22
"../core",
33
"../var/document",
44
"../manipulation" // appendTo
@@ -18,6 +18,7 @@ var iframe,
1818
* @param {String} name nodeName of the element
1919
* @param {Object} doc Document object
2020
*/
21+
2122
// Called only from within defaultDisplay
2223
function actualDisplay( name, doc ) {
2324
var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
@@ -46,7 +47,7 @@ function defaultDisplay( nodeName ) {
4647
if ( display === "none" || !display ) {
4748

4849
// Use the already-created iframe if possible
49-
iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" ))
50+
iframe = ( iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" ) )
5051
.appendTo( doc.documentElement );
5152

5253
// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
@@ -68,4 +69,4 @@ function defaultDisplay( nodeName ) {
6869
}
6970

7071
return defaultDisplay;
71-
});
72+
} );

‎src/data.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function isEmptyDataObject( obj ) {
4747
for ( name in obj ) {
4848

4949
// if the public data object is empty, the private is still empty
50-
if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
50+
if ( name === "data" && jQuery.isEmptyObject( obj[ name ] ) ) {
5151
continue;
5252
}
5353
if ( name !== "toJSON" ) {
@@ -80,7 +80,7 @@ function internalData( elem, name, data, pvt /* Internal Use Only */ ) {
8080

8181
// Avoid doing any more work than we need to when trying to get data on an
8282
// object that has no data at all
83-
if ( (!id || !cache[id] || (!pvt && !cache[id].data)) &&
83+
if ( ( !id || !cache[ id ] || ( !pvt && !cache[ id ].data ) ) &&
8484
data === undefined && typeof name === "string" ) {
8585
return;
8686
}
@@ -187,10 +187,11 @@ function internalRemoveData( elem, name, pvt ) {
187187
if ( name in thisCache ) {
188188
name = [ name ];
189189
} else {
190-
name = name.split(" ");
190+
name = name.split( " " );
191191
}
192192
}
193193
} else {
194+
194195
// If "name" is an array of keys...
195196
// When data is initially created, via ("key", "val") signature,
196197
// keys will be converted to camelCase.
@@ -202,7 +203,7 @@ function internalRemoveData( elem, name, pvt ) {
202203

203204
i = name.length;
204205
while ( i-- ) {
205-
delete thisCache[ name[i] ];
206+
delete thisCache[ name[ i ] ];
206207
}
207208

208209
// If there is no data left in the cache, we want to continue

‎src/deferred.js‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ define( [
44
"./callbacks"
55
], function( jQuery, slice ) {
66

7-
jQuery.extend({
7+
jQuery.extend( {
88

99
Deferred: function( func ) {
1010
var tuples = [
11+
1112
// action, add listener, listener list, final state
12-
[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
13-
[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
14-
[ "notify", "progress", jQuery.Callbacks("memory") ]
13+
[ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ],
14+
[ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ],
15+
[ "notify", "progress", jQuery.Callbacks( "memory" ) ]
1516
],
1617
state = "pending",
1718
promise = {
@@ -24,11 +25,12 @@ jQuery.extend({
2425
},
2526
then: function( /* fnDone, fnFail, fnProgress */ ) {
2627
var fns = arguments;
27-
return jQuery.Deferred(function( newDefer ) {
28+
return jQuery.Deferred( function( newDefer ) {
2829
jQuery.each( tuples, function( i, tuple ) {
2930
var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
31+
3032
// deferred[ done | fail | progress ] for forwarding actions to newDefer
31-
deferred[ tuple[1] ](function() {
33+
deferred[ tuple[ 1 ] ]( function() {
3234
var returned = fn && fn.apply( this, arguments );
3335
if ( returned && jQuery.isFunction( returned.promise ) ) {
3436
returned.promise()
@@ -46,6 +48,7 @@ jQuery.extend({
4648
fns = null;
4749
} ).promise();
4850
},
51+
4952
// Get a promise for this deferred
5053
// If obj is provided, the promise aspect is added to the object
5154
promise: function( obj ) {
@@ -63,11 +66,12 @@ jQuery.extend({
6366
stateString = tuple[ 3 ];
6467

6568
// promise[ done | fail | progress ] = list.add
66-
promise[ tuple[1] ] = list.add;
69+
promise[ tuple[ 1 ] ] = list.add;
6770

6871
// Handle state
6972
if ( stateString ) {
70-
list.add(function() {
73+
list.add( function() {
74+
7175
// state = [ resolved | rejected ]
7276
state = stateString;
7377

@@ -76,12 +80,12 @@ jQuery.extend({
7680
}
7781

7882
// deferred[ resolve | reject | notify ]
79-
deferred[ tuple[0] ] = function() {
80-
deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
83+
deferred[ tuple[ 0 ] ] = function() {
84+
deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments );
8185
return this;
8286
};
83-
deferred[ tuple[0] + "With" ] = list.fireWith;
84-
});
87+
deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
88+
} );
8589

8690
// Make the deferred a promise
8791
promise.promise( deferred );
@@ -117,7 +121,7 @@ jQuery.extend({
117121
if ( values === progressValues ) {
118122
deferred.notifyWith( contexts, values );
119123

120-
} else if ( !(--remaining) ) {
124+
} else if ( !( --remaining ) ) {
121125
deferred.resolveWith( contexts, values );
122126
}
123127
};

‎src/effects.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ function defaultPrefilter( elem, props, opts ) {
103103

104104
// height/width overflow pass
105105
if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
106+
106107
// Make sure that nothing sneaks out
107108
// Record all 3 overflow attributes because IE does not
108109
// change the overflow attribute when overflowX and
@@ -171,17 +172,17 @@ function defaultPrefilter( elem, props, opts ) {
171172
if ( hidden ) {
172173
jQuery( elem ).show();
173174
} else {
174-
anim.done(function() {
175+
anim.done( function() {
175176
jQuery( elem ).hide();
176-
});
177+
} );
177178
}
178-
anim.done(function() {
179+
anim.done( function() {
179180
var prop;
180181
jQuery._removeData( elem, "fxshow" );
181182
for ( prop in orig ) {
182183
jQuery.style( elem, prop, orig[ prop ] );
183184
}
184-
});
185+
} );
185186
for ( prop in orig ) {
186187
tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
187188

@@ -195,7 +196,7 @@ function defaultPrefilter( elem, props, opts ) {
195196
}
196197

197198
// If this is a noop like .hide().hide(), restore an overwritten display value
198-
} else if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" ) {
199+
} else if ( ( display === "none" ? defaultDisplay( elem.nodeName ) : display ) === "inline" ) {
199200
style.display = display;
200201
}
201202
}

‎src/event/alias.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ define( [
33
"../event"
44
], function( jQuery ) {
55

6-
jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
6+
jQuery.each( ( "blur focus focusin focusout load resize scroll unload click dblclick " +
77
"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
8-
"change select submit keydown keypress keyup error contextmenu").split(" "),
8+
"change select submit keydown keypress keyup error contextmenu" ).split( " " ),
99
function( i, name ) {
1010

1111
// Handle event binding

‎src/manipulation.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ function manipulationTarget( elem, content ) {
4949
return jQuery.nodeName( elem, "table" ) &&
5050
jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
5151

52-
elem.getElementsByTagName("tbody")[0] ||
53-
elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
52+
elem.getElementsByTagName( "tbody" )[ 0 ] ||
53+
elem.appendChild( elem.ownerDocument.createElement( "tbody" ) ) :
5454
elem;
5555
}
5656

0 commit comments

Comments
 (0)