Skip to content

Commit 3d62d57

Browse files
wonseopwonseop
authored
Build: Correct code indentations based on jQuery Style Guide
1. Correct code indentations based on jQuery Style Guide (contribute.jquery.org/style-guide/js/#spacing). 2. Add rules to "src/.eslintrc.json" to enable "enforcing consistent indentation", with minimal changes to the current code. Closes gh-4672
1 parent 11066a9 commit 3d62d57

16 files changed

+60
-42
lines changed

‎src/.eslintrc.json

+15-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212

1313
"rules": {
1414
"import/extensions": [ "error", "always" ],
15-
"import/no-cycle": "error"
15+
"import/no-cycle": "error",
16+
"indent": [ "error", "tab", {
17+
"outerIIFEBody": 0
18+
} ]
1619
},
1720

1821
"overrides": [
@@ -23,7 +26,17 @@
2326
"sourceType": "script"
2427
},
2528
"rules": {
26-
"no-unused-vars": "off"
29+
"no-unused-vars": "off",
30+
"indent": [ "error", "tab", {
31+
32+
// Unlike other codes, "wrapper.js" is implemented in UMD.
33+
// So it required a specific exception for jQuery's UMD
34+
// Code Style. This makes that indentation check is not
35+
// performed for 1 depth of outer FunctionExpressions
36+
"ignoredNodes": [
37+
"Program > ExpressionStatement > CallExpression > FunctionExpression > *"
38+
]
39+
} ]
2740
},
2841
"globals": {
2942
"jQuery": false,

‎src/ajax.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ var
4545

4646
// Anchor tag for parsing the document origin
4747
originAnchor = document.createElement( "a" );
48-
originAnchor.href = location.href;
48+
49+
originAnchor.href = location.href;
4950

5051
// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
5152
function addToPrefiltersOrTransports( structure ) {
@@ -426,8 +427,8 @@ jQuery.extend( {
426427
// Context for global events is callbackContext if it is a DOM node or jQuery collection
427428
globalEventContext = s.context &&
428429
( callbackContext.nodeType || callbackContext.jquery ) ?
429-
jQuery( callbackContext ) :
430-
jQuery.event,
430+
jQuery( callbackContext ) :
431+
jQuery.event,
431432

432433
// Deferreds
433434
deferred = jQuery.Deferred(),

‎src/ajax/xhr.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jQuery.ajaxSettings.xhr = function() {
88

99
var xhrSuccessStatus = {
1010

11-
// File protocol always yields status code 0, assume 200
12-
0: 200
13-
};
11+
// File protocol always yields status code 0, assume 200
12+
0: 200
13+
};
1414

1515
jQuery.ajaxTransport( function( options ) {
1616
var callback;

‎src/attributes/classes.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ jQuery.fn.extend( {
155155
if ( this.setAttribute ) {
156156
this.setAttribute( "class",
157157
className || value === false ?
158-
"" :
159-
dataPriv.get( this, "__className__" ) || ""
158+
"" :
159+
dataPriv.get( this, "__className__" ) || ""
160160
);
161161
}
162162
}
@@ -171,7 +171,7 @@ jQuery.fn.extend( {
171171
while ( ( elem = this[ i++ ] ) ) {
172172
if ( elem.nodeType === 1 &&
173173
( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
174-
return true;
174+
return true;
175175
}
176176
}
177177

‎src/core.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ jQuery.extend( {
303303
if ( isArrayLike( Object( arr ) ) ) {
304304
jQuery.merge( ret,
305305
typeof arr === "string" ?
306-
[ arr ] : arr
306+
[ arr ] : arr
307307
);
308308
} else {
309309
push.call( ret, arr );
@@ -405,9 +405,9 @@ if ( typeof Symbol === "function" ) {
405405

406406
// Populate the class2type map
407407
jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
408-
function( _i, name ) {
409-
class2type[ "[object " + name + "]" ] = name.toLowerCase();
410-
} );
408+
function( _i, name ) {
409+
class2type[ "[object " + name + "]" ] = name.toLowerCase();
410+
} );
411411

412412
function isArrayLike( obj ) {
413413

‎src/core/access.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
4343
for ( ; i < len; i++ ) {
4444
fn(
4545
elems[ i ], key, raw ?
46-
value :
47-
value.call( elems[ i ], i, fn( elems[ i ], key ) )
46+
value :
47+
value.call( elems[ i ], i, fn( elems[ i ], key ) )
4848
);
4949
}
5050
}

‎src/core/nodeName.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
function nodeName( elem, name ) {
22

3-
return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
3+
return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
44

55
};
66

‎src/css.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,10 @@ jQuery.each( [ "height", "width" ], function( _i, dimension ) {
320320
// Running getBoundingClientRect on a disconnected node
321321
// in IE throws an error.
322322
( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
323-
swap( elem, cssShow, function() {
324-
return getWidthOrHeight( elem, dimension, extra );
325-
} ) :
326-
getWidthOrHeight( elem, dimension, extra );
323+
swap( elem, cssShow, function() {
324+
return getWidthOrHeight( elem, dimension, extra );
325+
} ) :
326+
getWidthOrHeight( elem, dimension, extra );
327327
}
328328
},
329329

‎src/deprecated/event.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jQuery.fn.extend( {
2828
}
2929
} );
3030

31-
jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
31+
jQuery.each(
32+
( "blur focus focusin focusout resize scroll click dblclick " +
3233
"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
3334
"change select submit keydown keypress keyup contextmenu" ).split( " " ),
3435
function( _i, name ) {
@@ -39,4 +40,5 @@ jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
3940
this.on( name, null, data, fn ) :
4041
this.trigger( name );
4142
};
42-
} );
43+
}
44+
);

‎src/dimensions.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ import "./css.js";
66

77
// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
88
jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
9-
jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
10-
function( defaultExtra, funcName ) {
9+
jQuery.each( {
10+
padding: "inner" + name,
11+
content: type,
12+
"": "outer" + name
13+
}, function( defaultExtra, funcName ) {
1114

1215
// Margin is only for outerHeight, outerWidth
1316
jQuery.fn[ funcName ] = function( margin, value ) {

‎src/effects.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ function Animation( elem, properties, options ) {
338338
tweens: [],
339339
createTween: function( prop, end ) {
340340
var tween = jQuery.Tween( elem, animation.opts, prop, end,
341-
animation.opts.specialEasing[ prop ] || animation.opts.easing );
341+
animation.opts.specialEasing[ prop ] || animation.opts.easing );
342342
animation.tweens.push( tween );
343343
return tween;
344344
},
@@ -511,7 +511,8 @@ jQuery.fn.extend( {
511511
anim.stop( true );
512512
}
513513
};
514-
doAnimation.finish = doAnimation;
514+
515+
doAnimation.finish = doAnimation;
515516

516517
return empty || optall.queue === false ?
517518
this.each( doAnimation ) :

‎src/effects/Tween.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Tween.propHooks = {
8484
if ( jQuery.fx.step[ tween.prop ] ) {
8585
jQuery.fx.step[ tween.prop ]( tween );
8686
} else if ( tween.elem.nodeType === 1 && (
87-
jQuery.cssHooks[ tween.prop ] ||
87+
jQuery.cssHooks[ tween.prop ] ||
8888
tween.elem.style[ finalPropName( tween.prop ) ] != null ) ) {
8989
jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
9090
} else {

‎src/event.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ jQuery.event = {
295295
event = jQuery.event.fix( nativeEvent ),
296296

297297
handlers = (
298-
dataPriv.get( this, "events" ) || Object.create( null )
299-
)[ event.type ] || [],
298+
dataPriv.get( this, "events" ) || Object.create( null )
299+
)[ event.type ] || [],
300300
special = jQuery.event.special[ event.type ] || {};
301301

302302
// Use the fix-ed jQuery.Event rather than the (read-only) native event
@@ -416,12 +416,12 @@ jQuery.event = {
416416
get: typeof hook === "function" ?
417417
function() {
418418
if ( this.originalEvent ) {
419-
return hook( this.originalEvent );
419+
return hook( this.originalEvent );
420420
}
421421
} :
422422
function() {
423423
if ( this.originalEvent ) {
424-
return this.originalEvent[ name ];
424+
return this.originalEvent[ name ];
425425
}
426426
},
427427

‎src/event/trigger.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ jQuery.extend( jQuery.event, {
9999
special.bindType || type;
100100

101101
// jQuery handler
102-
handle = (
103-
dataPriv.get( cur, "events" ) || Object.create( null )
104-
)[ event.type ] &&
102+
handle = ( dataPriv.get( cur, "events" ) || Object.create( null ) )[ event.type ] &&
105103
dataPriv.get( cur, "handle" );
106104
if ( handle ) {
107105
handle.apply( cur, data );

‎src/selector.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -602,9 +602,11 @@ Expr = jQuery.expr = {
602602
TAG: function( nodeNameSelector ) {
603603
var expectedNodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
604604
return nodeNameSelector === "*" ?
605+
605606
function() {
606-
return true;
607-
} :
607+
return true;
608+
} :
609+
608610
function( elem ) {
609611
return nodeName( elem, expectedNodeName );
610612
};

‎src/serialize.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,14 @@ jQuery.fn.extend( {
101101
// Can add propHook for "elements" to filter or add form elements
102102
var elements = jQuery.prop( this, "elements" );
103103
return elements ? jQuery.makeArray( elements ) : this;
104-
} )
105-
.filter( function() {
104+
} ).filter( function() {
106105
var type = this.type;
107106

108107
// Use .is( ":disabled" ) so that fieldset[disabled] works
109108
return this.name && !jQuery( this ).is( ":disabled" ) &&
110109
rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
111110
( this.checked || !rcheckableType.test( type ) );
112-
} )
113-
.map( function( _i, elem ) {
111+
} ).map( function( _i, elem ) {
114112
var val = jQuery( this ).val();
115113

116114
if ( val == null ) {

0 commit comments

Comments
 (0)