Permalink
Browse files

added jshint linting to build:scripts task

  • Loading branch information...
1 parent 8a42d21 commit dcc77f13a46d94238d96c5ab36c902ae51ab03bb @mcarver mcarver committed Aug 8, 2015
View
@@ -1,6 +1,6 @@
node_modules
dist
-
+npm-debug.log
.idea
*.iml
.DS_Store
View
@@ -0,0 +1,90 @@
+{
+ "maxerr" : 50, // {int} Maximum error before stopping
+
+ // Enforcing
+ "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
+ "camelcase" : false, // true: Identifiers must be in camelCase
+ "curly" : false, // true: Require {} for every new block or scope
+ "eqeqeq" : false, // true: Require triple equals (===) for comparison
+ "forin" : false, // true: Require filtering for..in loops with obj.hasOwnProperty()
+ "freeze" : true, // true: prohibits overwriting prototypes of native objects such as Array, Date etc.
+ "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
+ "indent" : 4, // {int} Number of spaces to use for indentation
+ "latedef" : false, // true: Require variables/functions to be defined before being used
+ "newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
+ "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
+ "noempty" : true, // true: Prohibit use of empty blocks
+ "nonbsp" : true, // true: Prohibit "non-breaking whitespace" characters.
+ "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
+ "plusplus" : false, // true: Prohibit use of `++` & `--`
+ "quotmark" : false, // Quotation mark consistency:
+ // false : do nothing (default)
+ // true : ensure whatever is used is consistent
+ // "single" : require single quotes
+ // "double" : require double quotes
+ "undef" : false, // true: Require all non-global variables to be declared (prevents global leaks)
+ "unused" : false, // Unused variables:
+ // true : all variables, last function parameter
+ // "vars" : all variables only
+ // "strict" : all variables, all function parameters
+ "strict" : false, // true: Requires all functions run in ES5 Strict Mode
+ "maxparams" : false, // {int} Max number of formal params allowed per function
+ "maxdepth" : false, // {int} Max depth of nested blocks (within functions)
+ "maxstatements" : false, // {int} Max number statements per function
+ "maxcomplexity" : false, // {int} Max cyclomatic complexity per function
+ "maxlen" : false, // {int} Max number of characters per line
+ "varstmt" : false, // true: Disallow any var statements. Only `let` and `const` are allowed.
+
+ // Relaxing
+ "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
+ "boss" : false, // true: Tolerate assignments where comparisons would be expected
+ "debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
+ "eqnull" : true, // true: Tolerate use of `== null`
+ "es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
+ "esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
+ "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
+ // (ex: `for each`, multiple try/catch, function expression…)
+ "evil" : false, // true: Tolerate use of `eval` and `new Function()`
+ "expr" : false, // true: Tolerate `ExpressionStatement` as Programs
+ "funcscope" : false, // true: Tolerate defining variables inside control statements
+ "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
+ "iterator" : false, // true: Tolerate using the `__iterator__` property
+ "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
+ "laxbreak" : false, // true: Tolerate possibly unsafe line breakings
+ "laxcomma" : false, // true: Tolerate comma-first style coding
+ "loopfunc" : false, // true: Tolerate functions being defined in loops
+ "multistr" : false, // true: Tolerate multi-line strings
+ "noyield" : false, // true: Tolerate generator functions with no yield statement in them.
+ "notypeof" : false, // true: Tolerate invalid typeof operator values
+ "proto" : false, // true: Tolerate using the `__proto__` property
+ "scripturl" : false, // true: Tolerate script-targeted URLs
+ "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
+ "sub" : true, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
+ "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
+ "validthis" : false, // true: Tolerate using this in a non-constructor function
+
+ // Environments
+ "browser" : true, // Web Browser (window, document, etc)
+ "browserify" : false, // Browserify (node.js code in the browser)
+ "couch" : false, // CouchDB
+ "devel" : true, // Development/debugging (alert, confirm, etc)
+ "dojo" : false, // Dojo Toolkit
+ "jasmine" : false, // Jasmine
+ "jquery" : true, // jQuery
+ "mocha" : false, // Mocha
+ "mootools" : false, // MooTools
+ "node" : false, // Node.js
+ "nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
+ "phantom" : false, // PhantomJS
+ "prototypejs" : false, // Prototype and Scriptaculous
+ "qunit" : false, // QUnit
+ "rhino" : false, // Rhino
+ "shelljs" : false, // ShellJS
+ "typed" : false, // Globals for typed array constructions
+ "worker" : false, // Web Workers
+ "wsh" : false, // Windows Scripting Host
+ "yui" : false, // Yahoo User Interface
+
+ // Custom Globals
+ "globals" : {} // additional predefined global variables
+}
@@ -610,7 +610,7 @@ $(document).on("loadCustom", function() {
if(notes[map_path][i].key == noteKey) return i;
}
return -1;
- }
+ };
var startNote = function() {
console.log('starting note');
@@ -660,7 +660,7 @@ $(document).on("loadCustom", function() {
var createNote = function(note) {
var noteMarker = null;
- if(note.label && note.label != '') noteMarker = L.marker(L.latLng(note.lat, note.lng), setMarker(icons['note_marker'])).bindLabel(note.label).bindPopup(getNotePopup(note)).openPopup();
+ if(note.label && note.label !== '') noteMarker = L.marker(L.latLng(note.lat, note.lng), setMarker(icons['note_marker'])).bindLabel(note.label).bindPopup(getNotePopup(note)).openPopup();
else noteMarker = L.marker(L.latLng(note.lat, note.lng), setMarker(icons['note_marker'])).bindPopup(getNotePopup(note)).openPopup();
noteMarker.addTo(map);
noteMarkers[note.key] = noteMarker;
@@ -152,7 +152,7 @@ var doSearch = function() {
var count = '<li>'+results.length+' '+$.t('home.resultsFound')+'</li>';
resultsElement.append($(count));
var resultsLength = results.length;
- for(var i=0;i<resultsLength;i++) {
+ for(i=0;i<resultsLength;i++) {
var item = '<li><div><a href="'+results[i].link+'">'+results[i].label+' - '+results[i].map+'</a></div><div class="searchDescription"><div class="truncated" onclick="toggleTruncate(event, this)">'+results[i].popup+'</div></div></li>';
resultsElement.append($(item));
}
@@ -30,10 +30,10 @@
if (options.debug) console.log('loading custom');
$(document).trigger('loadCustom');
- if (options.debug) console.log('performing language substitutions')
+ if (options.debug) console.log('performing language substitutions');
$(document).i18n();
- if (options.debug) console.log('map loaded and ready')
+ if (options.debug) console.log('map loaded and ready');
});
});
File renamed without changes.
View
@@ -1,5 +1,5 @@
{
- "//" : [
+ "//": [
"--------",
"Build Instructions:",
"--------",
@@ -42,6 +42,7 @@
"browserify": "latest",
"http-server": "^0.8.0",
"imagemin": "^3.2.0",
+ "jshint": "^2.8.0",
"mkdirp": "^0.5.1",
"ncp": "^2.0.0",
"parallelshell": "^2.0.0",
@@ -50,6 +51,7 @@
},
"scripts": {
"clean": "rimraf dist/favicon.ico dist/index.html dist/files/fonts dist/files/images dist/files/locales dist/files/scripts dist/files/styles dist/s dist/v dist/w",
+ "lint": "jshint assets/scripts/custom/**.js",
"prebuild": "npm run clean -s && mkdirp dist/files --mode 0444",
"build": "npm run build:fonts && npm run build:images && npm run build:locales && npm run build:markup && npm run build:scripts && npm run build:styles",
"build:fonts": "ncp assets/fonts dist/files/fonts",
@@ -60,7 +62,8 @@
"watch:locales": "watch 'npm run build:locales' assets/locales",
"build:markup": "ncp assets/markup dist",
"watch:markup": "watch 'npm run build:markup' assets/markup",
- "build:scripts": "ncp assets/scripts dist/files/scripts",
+ "prebuild:scripts": "npm run lint",
+ "build:scripts": "ncp assets/scripts/custom dist/files/scripts && ncp assets/scripts/vendor dist/files/scripts",
"watch:scripts": "watch 'npm run build:scripts' assets/scripts",
"build:styles": "ncp assets/styles dist/files/styles",
"watch:styles": "watch 'npm run build:styles' assets/styles",

0 comments on commit dcc77f1

Please sign in to comment.