Permalink
Browse files

Make linting pass

Closes #1326
  • Loading branch information...
1 parent c0fb23a commit 26736e19472eb831be27367534d7c025efe9975c @SimenB SimenB committed Apr 23, 2015
Showing with 18 additions and 12 deletions.
  1. +7 −0 .jscsrc
  2. +2 −3 .travis.yml
  3. +6 −6 require.js
  4. +3 −3 testBaseUrl.js
View
@@ -1,6 +1,13 @@
{
"preset": "google",
"validateIndentation": 4,
+ "disallowSpacesInAnonymousFunctionExpression": null,
+ "disallowMultipleVarDecl": null,
+ "maximumLineLength": {
+ "value": 120,
+ "allowComments": true,
+ "allowRegex": true
+ },
"excludeFiles": [
"dist/**",
"node_modules/**",
View
@@ -1,5 +1,4 @@
+sudo: false
language: node_js
node_js:
- - "0.12"
- - "0.11"
- - "0.10"
+ - 0.12
View
@@ -589,7 +589,7 @@ var requirejs, require, define;
id: mod.map.id,
uri: mod.map.url,
config: function () {
- return getOwn(config.config, mod.map.id) || {};
+ return getOwn(config.config, mod.map.id) || {};
},
exports: mod.exports || (mod.exports = {})
});
@@ -1236,7 +1236,8 @@ var requirejs, require, define;
while (defQueue.length) {
args = defQueue.shift();
if (args[0] === null) {
- return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
+ return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' +
+ args[args.length - 1]));
} else {
//args are id, deps, factory. Should be normalized by the
//define() function.
@@ -1323,7 +1324,7 @@ var requirejs, require, define;
each(cfg.packages, function (pkgObj) {
var location, name;
- pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
+ pkgObj = typeof pkgObj === 'string' ? {name: pkgObj} : pkgObj;
name = pkgObj.name;
location = pkgObj.location;
@@ -1497,7 +1498,7 @@ var requirejs, require, define;
//in array so that the splices do not
//mess up the iteration.
eachReverse(defQueue, function(args, i) {
- if(args[0] === id) {
+ if (args[0] === id) {
defQueue.splice(i, 1);
}
});
@@ -1984,7 +1985,7 @@ var requirejs, require, define;
//like a module name.
mainScript = mainScript.replace(jsSuffixRegExp, '');
- //If mainScript is still a path, fall back to dataMain
+ //If mainScript is still a path, fall back to dataMain
if (req.jsExtRegExp.test(mainScript)) {
mainScript = dataMain;
}
@@ -2070,7 +2071,6 @@ var requirejs, require, define;
jQuery: true
};
-
/**
* Executes the text. Normally just uses eval, but can be modified
* to use a better, environment-specific call. Only used for transpiling
View
@@ -1,11 +1,11 @@
define([], function() {
doh.register(
- "testBaseUrl",
+ 'testBaseUrl',
[
- function testBaseUrl(t){
+ function testBaseUrl(t) {
t.is(true, true);
}
]
);
doh.run();
-});
+});

0 comments on commit 26736e1

Please sign in to comment.