@@ -584,10 +584,9 @@ var requirejs, require, define;
584
584
mod . usingExports = true ;
585
585
if ( mod . map . isDefine ) {
586
586
if ( mod . exports ) {
587
- return ( defined [ mod . map . id ] = mod . exports ) ;
588
- } else {
589
- return ( mod . exports = defined [ mod . map . id ] = { } ) ;
587
+ return ( defined [ mod . map . id ] = mod . exports ) ; // eslint-disable-line no-extra-parens
590
588
}
589
+ return ( mod . exports = defined [ mod . map . id ] = { } ) ; // eslint-disable-line no-return-assign
591
590
}
592
591
} ,
593
592
'module' : function ( mod ) {
@@ -989,18 +988,19 @@ var requirejs, require, define;
989
988
} ) ) ;
990
989
991
990
normalizedMod = getOwn ( registry , normalizedMap . id ) ;
991
+ /* eslint-disable max-depth */
992
992
if ( normalizedMod ) {
993
993
//Mark this as a dependency for this plugin, so it
994
994
//can be traced for cycles.
995
995
this . depMaps . push ( normalizedMap ) ;
996
-
997
996
if ( this . events . error ) {
998
997
normalizedMod . on ( 'error' , bind ( this , function ( err ) {
999
998
this . emit ( 'error' , err ) ;
1000
999
} ) ) ;
1001
1000
}
1002
1001
normalizedMod . enable ( ) ;
1003
1002
}
1003
+ /* eslint-enable max-depth */
1004
1004
1005
1005
return ;
1006
1006
}
@@ -1282,7 +1282,7 @@ var requirejs, require, define;
1282
1282
* Set a configuration for the context.
1283
1283
* @param {Object } cfg config object to integrate.
1284
1284
*/
1285
- configure : function ( cfg ) {
1285
+ configure : function ( cfg ) { // eslint-disable-line no-shadow
1286
1286
//Make sure the baseUrl ends in a slash.
1287
1287
if ( cfg . baseUrl ) {
1288
1288
if ( cfg . baseUrl . charAt ( cfg . baseUrl . length - 1 ) !== '/' ) {
@@ -1293,14 +1293,15 @@ var requirejs, require, define;
1293
1293
// Convert old style urlArgs string to a function.
1294
1294
if ( typeof cfg . urlArgs === 'string' ) {
1295
1295
var urlArgs = cfg . urlArgs ;
1296
+
1296
1297
cfg . urlArgs = function ( id , url ) {
1297
1298
return ( url . indexOf ( '?' ) === - 1 ? '?' : '&' ) + urlArgs ;
1298
1299
} ;
1299
1300
}
1300
1301
1301
1302
//Save off the paths since they require special processing,
1302
1303
//they are additive.
1303
- var shim = config . shim ,
1304
+ var shim = config . shim , // eslint-disable-line one-var
1304
1305
objs = {
1305
1306
paths : true ,
1306
1307
bundles : true ,
@@ -1512,7 +1513,7 @@ var requirejs, require, define;
1512
1513
//fix for #408
1513
1514
takeGlobalQueue ( ) ;
1514
1515
1515
- var map = makeModuleMap ( id , relMap , true ) ,
1516
+ var map = makeModuleMap ( id , relMap , true ) , // eslint-disable vars-on-top
1516
1517
mod = getOwn ( registry , id ) ;
1517
1518
1518
1519
mod . undefed = true ;
@@ -1731,7 +1732,7 @@ var requirejs, require, define;
1731
1732
var parents = [ ] ;
1732
1733
eachProp ( registry , function ( value , key ) {
1733
1734
if ( key . indexOf ( '_@r' ) !== 0 ) {
1734
- each ( value . depMaps , function ( depMap ) {
1735
+ each ( value . depMaps , function ( depMap ) {
1735
1736
if ( depMap . id === data . id ) {
1736
1737
parents . push ( key ) ;
1737
1738
return true ;
0 commit comments