Skip to content

Commit 26736e1

Browse files
committed
Make linting pass
Closes requirejs#1326
1 parent c0fb23a commit 26736e1

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

.jscsrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
{
22
"preset": "google",
33
"validateIndentation": 4,
4+
"disallowSpacesInAnonymousFunctionExpression": null,
5+
"disallowMultipleVarDecl": null,
6+
"maximumLineLength": {
7+
"value": 120,
8+
"allowComments": true,
9+
"allowRegex": true
10+
},
411
"excludeFiles": [
512
"dist/**",
613
"node_modules/**",

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1+
sudo: false
12
language: node_js
23
node_js:
3-
- "0.12"
4-
- "0.11"
5-
- "0.10"
4+
- 0.12

require.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ var requirejs, require, define;
589589
id: mod.map.id,
590590
uri: mod.map.url,
591591
config: function () {
592-
return getOwn(config.config, mod.map.id) || {};
592+
return getOwn(config.config, mod.map.id) || {};
593593
},
594594
exports: mod.exports || (mod.exports = {})
595595
});
@@ -1236,7 +1236,8 @@ var requirejs, require, define;
12361236
while (defQueue.length) {
12371237
args = defQueue.shift();
12381238
if (args[0] === null) {
1239-
return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
1239+
return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' +
1240+
args[args.length - 1]));
12401241
} else {
12411242
//args are id, deps, factory. Should be normalized by the
12421243
//define() function.
@@ -1323,7 +1324,7 @@ var requirejs, require, define;
13231324
each(cfg.packages, function (pkgObj) {
13241325
var location, name;
13251326

1326-
pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
1327+
pkgObj = typeof pkgObj === 'string' ? {name: pkgObj} : pkgObj;
13271328

13281329
name = pkgObj.name;
13291330
location = pkgObj.location;
@@ -1497,7 +1498,7 @@ var requirejs, require, define;
14971498
//in array so that the splices do not
14981499
//mess up the iteration.
14991500
eachReverse(defQueue, function(args, i) {
1500-
if(args[0] === id) {
1501+
if (args[0] === id) {
15011502
defQueue.splice(i, 1);
15021503
}
15031504
});
@@ -1984,7 +1985,7 @@ var requirejs, require, define;
19841985
//like a module name.
19851986
mainScript = mainScript.replace(jsSuffixRegExp, '');
19861987

1987-
//If mainScript is still a path, fall back to dataMain
1988+
//If mainScript is still a path, fall back to dataMain
19881989
if (req.jsExtRegExp.test(mainScript)) {
19891990
mainScript = dataMain;
19901991
}
@@ -2070,7 +2071,6 @@ var requirejs, require, define;
20702071
jQuery: true
20712072
};
20722073

2073-
20742074
/**
20752075
* Executes the text. Normally just uses eval, but can be modified
20762076
* to use a better, environment-specific call. Only used for transpiling

testBaseUrl.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
define([], function() {
22
doh.register(
3-
"testBaseUrl",
3+
'testBaseUrl',
44
[
5-
function testBaseUrl(t){
5+
function testBaseUrl(t) {
66
t.is(true, true);
77
}
88
]
99
);
1010
doh.run();
11-
});
11+
});

0 commit comments

Comments
 (0)