From 2217c40f1263317a7bbfb7ea35ff79c20b79fbff Mon Sep 17 00:00:00 2001 From: Shane Osbourne Date: Fri, 9 Jan 2015 11:42:27 +0000 Subject: [PATCH] Fix lint errors --- .editorconfig | 26 +++++++++++++++ .jshintrc | 33 +++++++++++++++++++ gulpfile.js | 11 +++---- index.js | 6 ++-- lib/js/dist/app.js | 10 +++--- lib/js/scripts/MainCtrl.js | 4 +-- lib/js/scripts/filters.js | 2 +- lib/js/scripts/modules/disconnect.js | 4 +-- package.json | 1 + server/hooks.js | 5 ++- server/opts.js | 22 ++++++------- server/server.js | 2 -- server/utils.js | 1 - test/.jshintrc | 1 + .../specs/directives/snippet-info.test.js | 4 +-- test/client/specs/modules/disconnect.js | 4 +-- test/client/specs/modules/history.js | 4 +-- .../specs/services/ContentSectionsSpec.js | 2 +- test/server/history.js | 7 ++-- test/server/init.js | 6 ++-- test/server/options.js | 21 ------------ test/server/urls.add.js | 3 +- 22 files changed, 104 insertions(+), 75 deletions(-) create mode 100644 .editorconfig create mode 100644 .jshintrc diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..6fbb61e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,26 @@ +# http://EditorConfig.org + +# top-most EditorConfig file +root = true + +[*] +charset = "utf8" + + +[*.css] +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + + +[*.js] +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true +quote_type = double + + +[*.json] +indent_style = space +indent_size = 2 +trim_trailing_whitespace = true diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 0000000..0916036 --- /dev/null +++ b/.jshintrc @@ -0,0 +1,33 @@ +{ + "curly": true, + "eqeqeq": true, + "immed": true, + "laxbreak": false, + "latedef": "nofunc", + "newcap": true, + "noarg": true, + "plusplus": true, + "sub": true, + "undef": true, + "quotmark": "double", + "unused": true, + "indent": 4, + "eqnull": true, + "node": true, + "strict": false, + "mocha": true, + "jasmine": true, + "globals": { + "window": false, + "browser": false, + "sinon": false, + "___browserSync___": false, + "assert": false, + "by": false, + "element": false, + "protractor": false, + "assert": false, + "inject": false, + "angular": false + } +} diff --git a/gulpfile.js b/gulpfile.js index 2e03bac..3f82a8c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,7 +2,6 @@ var gulp = require("gulp"); var jshint = require("gulp-jshint"); var contribs = require("gulp-contribs"); var sass = require("gulp-sass"); -var fs = require("fs"); var autoprefix = require("gulp-autoprefixer"); var browserify = require("gulp-browserify"); var rename = require("gulp-rename"); @@ -10,7 +9,6 @@ var filter = require("gulp-filter"); var sprites = require("gulp-svg-sprites"); var browserSync = require("browser-sync"); var crossbow = require("crossbow/plugins/stream"); -var reload = browserSync.reload; /** * Lint all JS files @@ -24,10 +22,10 @@ gulp.task("lint", function () { "server/*.js", "gulpfile.js", ]) - .pipe(require("no-abs")()); - //.pipe(jshint("test/.jshintrc")) - //.pipe(jshint.reporter("default")) - //.pipe(jshint.reporter("fail")); + .pipe(require("no-abs")()) + .pipe(jshint(".jshintrc")) + .pipe(jshint.reporter("default")) + .pipe(jshint.reporter("fail")); }); /** @@ -150,4 +148,3 @@ gulp.task("dev", ["browserify"], function () { gulp.watch("lib/scss/**/*.scss", ["sass"]); gulp.watch("lib/js/scripts/**/*.js", ["browserify"]); }); - diff --git a/index.js b/index.js index b1ee5db..99e170a 100644 --- a/index.js +++ b/index.js @@ -1,7 +1,5 @@ "use strict"; -var path = require("path"); - var EE = require("easy-extender"); var async = require("./server/async"); @@ -48,7 +46,7 @@ var ControlPanel = function (opts, bs, emitter) { ControlPanel.prototype.getServer = function (cb) { var cp = this; if (!cp.server) { - this.events.on("cp:running", function (out) { + this.events.on("cp:running", function () { cb(null, cp.server); }); } @@ -110,7 +108,7 @@ ControlPanel.prototype.init = function () { cp.logger.debug("{green:Step Complete: " + item.step); cb(); }); - }, function (err) { + }, function () { cp.events.emit("cp:running", {instance: cp, options: cp.opts}); cp.logger.info("Running at: {cyan:http://localhost:%s", cp.opts.get("port")); }); diff --git a/lib/js/dist/app.js b/lib/js/dist/app.js index 8917e73..5ccc332 100644 --- a/lib/js/dist/app.js +++ b/lib/js/dist/app.js @@ -73,7 +73,7 @@ function MainCtrl ($$scope, $rootScope, $location, Socket, $injector) { /** * @param options */ - connection: function (options, socket) { + connection: function (options) { // TODO: Add socket tracking. //if (socket) { @@ -84,7 +84,7 @@ function MainCtrl ($$scope, $rootScope, $location, Socket, $injector) { /** * */ - disconnect: function (data) { + disconnect: function () { $scope.ui.disconnected = true; } }; @@ -226,7 +226,7 @@ module.directive("markable", function () { return { scope: {}, restrict: "A", - link: function (scope, elem, attrs) { + link: function () { //var click = function (evt) { // elem.toggleClass("active"); //}; @@ -257,14 +257,14 @@ module.exports = app; * Custom Notify module for Global notifications * */ -angular.module('Disconnect', []) +angular.module("Disconnect", []) .directive("disconnectElem", function () { return { restrict: "E", scope: {}, - template: '

{{ui.heading}} {{ui.message}}

Possible reasons are:

', + template: '

{{ui.heading}} {{ui.message}}

Possible reasons are:

', // jshint:ignore controller: ["$scope", "$rootScope", "$window", disconnectController] }; }); diff --git a/lib/js/scripts/MainCtrl.js b/lib/js/scripts/MainCtrl.js index 5a75566..d328813 100644 --- a/lib/js/scripts/MainCtrl.js +++ b/lib/js/scripts/MainCtrl.js @@ -72,7 +72,7 @@ function MainCtrl ($$scope, $rootScope, $location, Socket, $injector) { /** * @param options */ - connection: function (options, socket) { + connection: function (options) { // TODO: Add socket tracking. //if (socket) { @@ -83,7 +83,7 @@ function MainCtrl ($$scope, $rootScope, $location, Socket, $injector) { /** * */ - disconnect: function (data) { + disconnect: function () { $scope.ui.disconnected = true; } }; diff --git a/lib/js/scripts/filters.js b/lib/js/scripts/filters.js index 7bda7dc..7f6c2f7 100644 --- a/lib/js/scripts/filters.js +++ b/lib/js/scripts/filters.js @@ -36,7 +36,7 @@ module.directive("markable", function () { return { scope: {}, restrict: "A", - link: function (scope, elem, attrs) { + link: function () { //var click = function (evt) { // elem.toggleClass("active"); //}; diff --git a/lib/js/scripts/modules/disconnect.js b/lib/js/scripts/modules/disconnect.js index 9e216b0..08d4574 100644 --- a/lib/js/scripts/modules/disconnect.js +++ b/lib/js/scripts/modules/disconnect.js @@ -3,14 +3,14 @@ * Custom Notify module for Global notifications * */ -angular.module('Disconnect', []) +angular.module("Disconnect", []) .directive("disconnectElem", function () { return { restrict: "E", scope: {}, - template: '

{{ui.heading}} {{ui.message}}

Possible reasons are:

', + template: '

{{ui.heading}} {{ui.message}}

Possible reasons are:

', // jshint:ignore controller: ["$scope", "$rootScope", "$window", disconnectController] }; }); diff --git a/package.json b/package.json index 95c8278..9c07eba 100644 --- a/package.json +++ b/package.json @@ -79,3 +79,4 @@ }, "keywords": [] } + diff --git a/server/hooks.js b/server/hooks.js index 123c3ed..a784592 100644 --- a/server/hooks.js +++ b/server/hooks.js @@ -1,4 +1,3 @@ -var _ = require("lodash"); var fs = require("fs"); var path = require("path"); var tmpl = fs.readFileSync(__dirname + "/templates/plugin.tmpl", "utf-8"); @@ -40,7 +39,7 @@ module.exports = { return configTmpl.replace("%when%", items) .replace("%pages%", JSON.stringify(pagesConfig, null, 4)); }, - "markup": function (hooks, initial) { + "markup": function (hooks) { var out = hooks.reduce(function (combined, item) { return [combined, tmpl.replace("%markup%", item)].join("\n"); }, ""); @@ -49,7 +48,7 @@ module.exports = { "client:js": function (hooks) { return hooks.join(";"); }, - "templates": function (hooks, cb) { + "templates": function (hooks) { var inlineTemplates = createInlineTemplates(hooks); return inlineTemplates; diff --git a/server/opts.js b/server/opts.js index 637186f..d22225c 100644 --- a/server/opts.js +++ b/server/opts.js @@ -1,5 +1,5 @@ var Immutable = require("immutable"); -var transforms = require("./transforms"); +//var transforms = require("./transforms"); var defaults = Immutable.Map({ port: 3001 @@ -17,13 +17,13 @@ module.exports.merge = function (obj) { * @param {Immutable.Map} obj * @returns {*} */ -function transformOptions(obj) { - - var out; - - Object.keys(transforms).forEach(function (key) { - out = obj.set(key, transforms[key](obj)); - }); - - return out; -} \ No newline at end of file +//function transformOptions(obj) { +// +// var out; +// +// Object.keys(transforms).forEach(function (key) { +// out = obj.set(key, transforms[key](obj)); +// }); +// +// return out; +//} \ No newline at end of file diff --git a/server/server.js b/server/server.js index 5711d8c..abfdaf7 100644 --- a/server/server.js +++ b/server/server.js @@ -1,7 +1,5 @@ -var _ = require("lodash"); var connect = require("connect"); var through = require("through"); -var path = require("path"); var http = require("http"); var fs = require("fs"); var serveStatic = require("serve-static"); diff --git a/server/utils.js b/server/utils.js index 7498a98..5bf87e7 100644 --- a/server/utils.js +++ b/server/utils.js @@ -1,4 +1,3 @@ -var path = require("path"); var url = require("url"); var http = require("http"); diff --git a/test/.jshintrc b/test/.jshintrc index 19027e9..4930ee2 100644 --- a/test/.jshintrc +++ b/test/.jshintrc @@ -14,6 +14,7 @@ "eqnull": true, "node": true, "validthis": true, + "mocha": true, "globals": { "describe" : false, "it" : false, diff --git a/test/client/specs/directives/snippet-info.test.js b/test/client/specs/directives/snippet-info.test.js index ee1428b..719e81f 100644 --- a/test/client/specs/directives/snippet-info.test.js +++ b/test/client/specs/directives/snippet-info.test.js @@ -25,8 +25,8 @@ describe("Directive: Snippet info", function () { }); it("Should be shown be default", function () { - var localScope = scope.$$childHead; -// assert.equal(localScope.ui.snippet, true); + //var localScope = scope.$$childHead; + //assert.equal(localScope.ui.snippet, true); }); }); }); \ No newline at end of file diff --git a/test/client/specs/modules/disconnect.js b/test/client/specs/modules/disconnect.js index b1cef1f..13afd60 100644 --- a/test/client/specs/modules/disconnect.js +++ b/test/client/specs/modules/disconnect.js @@ -4,13 +4,11 @@ describe("When using the disconnect element", function () { var scope, element, compile; - var $window; - beforeEach(module("BrowserSync")); beforeEach(module("test.templates")); // Initialize the controller and a mock scope - beforeEach(inject(function ($compile, $rootScope, _$window_) { + beforeEach(inject(function ($compile, $rootScope) { scope = $rootScope; compile = $compile; })); diff --git a/test/client/specs/modules/history.js b/test/client/specs/modules/history.js index 01ba64f..fad76f1 100644 --- a/test/client/specs/modules/history.js +++ b/test/client/specs/modules/history.js @@ -1,13 +1,11 @@ describe("Module: History", function () { - var scope, element, compile, clock; - beforeEach(module("BrowserSync")); beforeEach(module("test.templates")); describe("When using the history module", function () { - var Location, rootScope, isolatedScope, Socket; + var Location, rootScope, Socket; beforeEach(inject(function (_Location_, $rootScope, _Socket_, $q) { Location = _Location_; Socket = _Socket_; diff --git a/test/client/specs/services/ContentSectionsSpec.js b/test/client/specs/services/ContentSectionsSpec.js index dac2207..253204a 100644 --- a/test/client/specs/services/ContentSectionsSpec.js +++ b/test/client/specs/services/ContentSectionsSpec.js @@ -12,7 +12,7 @@ describe("Content Sections Value/Service", function () { values = $injector.get("contentSections"); })); it("should be able to transform a value", function () { - var transformed = sections.transform(values["history"], function (item) { + sections.transform(values["history"], function (item) { item.title = "Shane"; return item; }); diff --git a/test/server/history.js b/test/server/history.js index eead434..ac52554 100644 --- a/test/server/history.js +++ b/test/server/history.js @@ -1,20 +1,21 @@ +/*jshint -W079 */ var Immutable = require("immutable"); var history = require("../../server/plugins/history/history"); var assert = require("chai").assert; describe("Saving history", function () { it("Adding a new path", function () { - var imm = Immutable.OrderedSet('/'); + var imm = Immutable.OrderedSet("/"); var out = history.addPath(imm, "http://localhost/shane"); assert.deepEqual(out.toJS(), ["/", "/shane"]); }); it("Adding a dupe path", function () { - var imm = Immutable.OrderedSet('/'); + var imm = Immutable.OrderedSet("/"); var out = history.addPath(imm, "http://localhost/"); assert.deepEqual(out.toJS(), ["/"]); }); it("Can remove a path", function () { - var imm = Immutable.OrderedSet(['/', "/shane"]); + var imm = Immutable.OrderedSet(["/", "/shane"]); var out = history.removePath(imm, "http://localhost/"); assert.deepEqual(out.toJS(), ["/shane"]); }); diff --git a/test/server/init.js b/test/server/init.js index 070bcf0..367f6ee 100644 --- a/test/server/init.js +++ b/test/server/init.js @@ -1,7 +1,7 @@ +/*jshint -W079 */ var browserSync = require("browser-sync"); var cp = require("../../index"); var assert = require("chai").assert; -var sinon = require("sinon"); var config = require("../../server/config"); var request = require("supertest"); @@ -35,7 +35,7 @@ describe("Can be started with browserSync instance", function() { request(controlPanel.server) .get("/") .expect(200) - .end(function (err, res, req) { + .end(function (err, res) { assert.include(res.text, "Browser Sync - Control Panel"); done(); }); @@ -54,7 +54,7 @@ describe("Can be started with browserSync instance", function() { request(controlPanel.server) .get(config.defaults.appJs) .expect(200, function (err, res) { - assert.include(res.text, 'angular'); + assert.include(res.text, "angular"); done(); }); }); diff --git a/test/server/options.js b/test/server/options.js index 7dc5aac..e69de29 100644 --- a/test/server/options.js +++ b/test/server/options.js @@ -1,21 +0,0 @@ -var assert = require("chai").assert; -var opts = require("../../server/opts"); -var exampleOpts = require("../opts.server.json"); - -describe("Can create immutable map from bs options", function() { - - var bsInstance; - - before(function () { - - }); - - after(function () { - - }); - - it("can adds the Mode property", function() { - //var options = opts(exampleOpts); - //console.log(options.get("mode")); - }); -}); diff --git a/test/server/urls.add.js b/test/server/urls.add.js index c73d0cb..a4e6d11 100644 --- a/test/server/urls.add.js +++ b/test/server/urls.add.js @@ -1,9 +1,10 @@ +/*jshint -W079 */ var urls = require("../../server/urls"); var assert = require("chai").assert; describe("Adding Urls", function() { - var validUrls, bsSpy; + var validUrls; beforeEach(function () { validUrls = [{