👕: config linters similarly, related updates

KylePDavis · Jun 20, 2015 · 8ff23cd · 8ff23cd
1 parent 57d3950
commit 8ff23cd
Show file tree

Hide file tree

Showing 16 changed files with 107 additions and 105 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -39,6 +39,7 @@
 		// Stylistic Issues
 		"brace-style": [2, "1tbs"],
 		"camelcase": [2, {"properties": "always"}],
+		"no-underscore-dangle": 0,
 
 		// ECMAScript 6
 		//

diff --git a/.jscsrc b/.jscsrc
@@ -56,7 +56,7 @@
   // disallowSpacesInNamedFunctionExpression
   "disallowSpacesInsideArrayBrackets": true,
   "disallowSpacesInsideBrackets": true,
-  "disallowSpacesInsideObjectBrackets": true,
+  // disallowSpacesInsideObjectBrackets
   "disallowSpacesInsideParentheses": true,
   // disallowTrailingComma
   "disallowTrailingWhitespace": true,
@@ -100,7 +100,7 @@
   "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
   // requireSpaceBeforeBlockStatements
   // requireSpaceBeforeKeywords
-  // requireSpaceBeforeObjectValues
+  "requireSpaceBeforeObjectValues": true,
   // requireSpaceBeforePostfixUnaryOperators
   // requireSpaceBetweenArguments
   // requireSpacesInAnonymousFunctionExpression
@@ -120,7 +120,9 @@
   // requireSpacesInNamedFunctionExpression
   // requireSpacesInsideArrayBrackets
   // requireSpacesInsideBrackets
-  // requireSpacesInsideObjectBrackets
+  "requireSpacesInsideObjectBrackets": {
+      "allExcept": [")"]
+  },
   // requireSpacesInsideParentheses
   "requireTrailingComma": {
     "ignoreSingleLine": true,

diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
   "main": "src/app/main.js",
   "scripts": {
     "postinstall": "bower install",
-    "test": "jshint src/  &&  jscs src/app/ src/web/{*.js,components,pages}",
+    "test": "eslint src/  &&  jshint src/  &&  jscs src/app/ src/web/{*.js,components,pages}",
     "start": "electron ."
   },
   "dependencies": {

diff --git a/src/app/AppMenu.js b/src/app/AppMenu.js
@@ -19,13 +19,16 @@ module.exports = class AppMenu extends EventEmitter {
 	/**
 	 * Get copy of template and replace click strings with click handler functions that emit event
 	 * @method _getTemplateWithClickHandlers
+	 * @param  {Object} tmpl The menu template Object
 	 * @private
+	 * @return {Object} The results of the menu template Object with click handler functions
 	 */
 	_getTemplateWithClickHandlers(tmpl) {
 		let self = this;
 		return JSON.parse(JSON.stringify(tmpl), (k, v) => {
-			if (k === "click" && typeof v === "string")
+			if (k === "click" && typeof v === "string") {
 				return () => self.emit(v);
+			}
 			return v;
 		});
 	}

diff --git a/src/app/AppWindow.js b/src/app/AppWindow.js
@@ -10,7 +10,7 @@ module.exports = class AppWindow extends EventEmitter {
 	constructor(pkg) {
 		super();
 		let mousePos = screen.getCursorScreenPoint(),
-			winSize = {w:800, h:600},
+			winSize = { w: 800, h: 600 },
 			winOpts = {
 				x: mousePos.x - (winSize.w / 2),
 				y: mousePos.y - (winSize.h / 2),

diff --git a/src/app/Application.js b/src/app/Application.js
@@ -13,8 +13,9 @@ module.exports = class Application {
 		this.windows = new Set();
 
 		app.on("window-all-closed", () => {
-			if (process.platform !== "darwin")
+			if (process.platform !== "darwin") {
 				app.quit();
+			}
 		});
 
 		this.openWindow();

diff --git a/src/app/menus/darwin.js b/src/app/menus/darwin.js
@@ -7,59 +7,59 @@ module.exports = function(pkg) {
 		{
 			label: `${pkg.productName}`,
 			submenu: [
-				{label:`About ${pkg.productName}`, selector:"orderFrontStandardAboutPanel:"},
-				//TODO: {label:"Restart and Install Update", click:"application:install-update", visible:false},
-				//TODO: {label:"Check for Update", click:"application:check-for-update", visible:false},
-				//TODO: {label:"Downloading Update", enabled:false, visible:false},
-				{type:"separator"},
-				//TODO: {label:"Preferences...", accelerator:"Cmd+,", click:"application:show-settings"},
-				{type:"separator"},
-				{label:"Services", submenu:[]},
-				{type:"separator"},
-				{label:`Hide ${pkg.productName}`, accelerator:"Cmd+H", selector:"hide:"},
-				{label:"Hide Others", accelerator:"Cmd+Shift+H", selector:"hideOtherApplications:"},
-				{label:"Show All", selector:"unhideAllApplications:"},
-				{type:"separator"},
-				{label:"Quit", accelerator:"Cmd+Q", click:"application:quit"},
+				{ label: `About ${pkg.productName}`, selector: "orderFrontStandardAboutPanel:" },
+				//TODO: { label: "Restart and Install Update", click: "application:install-update", visible: false },
+				//TODO: { label: "Check for Update", click: "application:check-for-update", visible: false },
+				//TODO: { label: "Downloading Update", enabled: false, visible: false },
+				{ type: "separator" },
+				//TODO: { label: "Preferences...", accelerator: "Cmd+,", click: "application:show-settings" },
+				{ type: "separator" },
+				{ label: "Services", submenu: [] },
+				{ type: "separator" },
+				{ label: `Hide ${pkg.productName}`, accelerator: "Cmd+H", selector: "hide:" },
+				{ label: "Hide Others", accelerator: "Cmd+Shift+H", selector: "hideOtherApplications:" },
+				{ label: "Show All", selector: "unhideAllApplications:" },
+				{ type: "separator" },
+				{ label: "Quit", accelerator: "Cmd+Q", click: "application:quit" },
 			],
 		},
 
 		{
 			label: "File",
 			submenu: [
-				{label:"New Window", accelerator:"Cmd+Shift+N", click:"file:new-window"},
-				//{label:"New", accelerator:"Cmd+N", click:"file:new"},
-				{label:"Close", accelerator:"Cmd+W", selector:"performClose:"},
+				{ label: "New Window", accelerator: "Cmd+Shift+N", click: "file:new-window" },
+				// { label: "New", accelerator: "Cmd+N", click: "file:new" },
+				{ label: "Close", accelerator: "Cmd+W", selector: "performClose:" },
 			],
 		},
 
 		{
 			label: "Edit",
 			submenu: [
-				{label:"Undo", accelerator:"Cmd+Z", selector:"undo:"},
-				{label:"Redo", accelerator:"Shift+Cmd+Z", selector:"redo:"},
-				{type:"separator"},
-				{label:"Cut", accelerator:"Cmd+X", selector:"cut:"},
-				{label:"Copy", accelerator:"Cmd+C", selector:"copy:"},
-				{label:"Paste", accelerator:"Cmd+V", selector:"paste:"},
-				{label:"Select All", accelerator:"Cmd+A", selector:"selectAll:"},
+				{ label: "Undo", accelerator: "Cmd+Z", selector: "undo:" },
+				{ label: "Redo", accelerator: "Shift+Cmd+Z", selector: "redo:" },
+				{ type: "separator" },
+				{ label: "Cut", accelerator: "Cmd+X", selector: "cut:" },
+				{ label: "Copy", accelerator: "Cmd+C", selector: "copy:" },
+				{ label: "Paste", accelerator: "Cmd+V", selector: "paste:" },
+				{ label: "Select All", accelerator: "Cmd+A", selector: "selectAll:" },
 			],
 		},
 
 		{
 			label: "View",
 			submenu: [
-				{label:"Server", accelerator:"Cmd+1", click:"view:server"},
-				{label:"Database", accelerator:"Cmd+2", click:"view:database"},
-				{label:"Collection", accelerator:"Cmd+3", click:"view:collection"},
-				{type:"separator"},
-				{label:"Reload", accelerator:"Command+R", click:"window:reload"},
-				{label:"Toggle Full Screen", accelerator:"Cmd+Ctrl+F", click:"window:toggle-full-screen"},
+				{ label: "Server", accelerator: "Cmd+1", click: "view:server" },
+				{ label: "Database", accelerator: "Cmd+2", click: "view:database" },
+				{ label: "Collection", accelerator: "Cmd+3", click: "view:collection" },
+				{ type: "separator" },
+				{ label: "Reload", accelerator: "Command+R", click: "window:reload" },
+				{ label: "Toggle Full Screen", accelerator: "Cmd+Ctrl+F", click: "window:toggle-full-screen" },
 				{
 					label: "Developer",
 					submenu: [
-						//TODO: {label:"Run Tests...", accelerator:"Alt+Cmd+T", click:"application:run-specs"},
-						{label:"Toggle DevTools", accelerator:"Alt+Cmd+I", click:"window:toggle-dev-tools"},
+						//TODO: { label: "Run Tests...", accelerator: "Alt+Cmd+T", click: "application:run-specs" },
+						{ label: "Toggle DevTools", accelerator: "Alt+Cmd+I", click: "window:toggle-dev-tools" },
 					],
 				},
 			],
@@ -68,23 +68,23 @@ module.exports = function(pkg) {
 		{
 			label: "Window",
 			submenu: [
-				{label:"Minimize", accelerator:"Cmd+M", selector:"performMiniaturize:"},
-				{label:"Zoom", selector:"performZoom:"},
-				{type:"separator"},
-				//TODO: {label:"Show Previous Tab", accelerator:"Shift+Cmd+[", click:"window:show-previous-tab"},
-				//TODO: {label:"Show Next Tab", accelerator:"Shift+Cmd+]", click:"window:show-next-tab"},
-				//TODO: {label:"Show Previous Lower Tab", accelerator:"Cmd+[", click:"window:show-previous-lower-tab"},
-				//TODO: {label:"Show Next Lower Tab", accelerator:"Cmd+]", click:"window:show-next-lower-tab"},
-				{type:"separator"},
-				{label:"Bring All to Front", selector:"arrangeInFront:"},
+				{ label: "Minimize", accelerator: "Cmd+M", selector: "performMiniaturize:" },
+				{ label: "Zoom", selector: "performZoom:" },
+				{ type: "separator" },
+				//TODO: { label: "Show Previous Tab", accelerator: "Shift+Cmd+[", click: "window:show-previous-tab" },
+				//TODO: { label: "Show Next Tab", accelerator: "Shift+Cmd+]", click: "window:show-next-tab" },
+				//TODO: { label: "Show Previous Lower Tab", accelerator: "Cmd+[", click: "window:show-previous-lower-tab" },
+				//TODO: { label: "Show Next Lower Tab", accelerator: "Cmd+]", click: "window:show-next-lower-tab" },
+				{ type: "separator" },
+				{ label: "Bring All to Front", selector: "arrangeInFront:" },
 			],
 		},
 
 		{
 			label: "Help",
 			submenu: [
-				{label:"Web Site", click:"application:website"},
-				{label:"Report Issue", click:"application:report-issue"},
+				{ label: "Web Site", click: "application:website" },
+				{ label: "Report Issue", click: "application:report-issue" },
 			],
 		},
 

diff --git a/src/app/menus/linux.js b/src/app/menus/linux.js
@@ -7,34 +7,34 @@ module.exports = function(pkg) {
 		{
 			label: "&File",
 			submenu: [
-				{label:"&Preferences", click:"application:show-settings"},
-				{label:"Quit", accelerator:"Ctrl+Q", click:"application:quit"},
+				{ label: "&Preferences", click: "application:show-settings" },
+				{ label: "Quit", accelerator: "Ctrl+Q", click: "application:quit" },
 			],
 		},
 
 		{
 			label: "&Edit",
 			submenu: [
-				{label:"&Undo", accelerator:"Ctrl+Z", click:"core:undo"},
-				{label:"&Redo", accelerator:"Ctrl+Y", click:"core:redo"},
-				{type:"separator"},
-				{label:"&Cut", accelerator:"Ctrl+X", click:"core:cut"},
-				{label:"C&opy", accelerator:"Ctrl+C", click:"core:copy"},
-				{label:"&Paste", accelerator:"Ctrl+V", click:"core:paste"},
-				{label:"Select &All", accelerator:"Ctrl+A", click:"core:select-all"},
+				{ label: "&Undo", accelerator: "Ctrl+Z", click: "core:undo" },
+				{ label: "&Redo", accelerator: "Ctrl+Y", click: "core:redo" },
+				{ type: "separator" },
+				{ label: "&Cut", accelerator: "Ctrl+X", click: "core:cut" },
+				{ label: "C&opy", accelerator: "Ctrl+C", click: "core:copy" },
+				{ label: "&Paste", accelerator: "Ctrl+V", click: "core:paste" },
+				{ label: "Select &All", accelerator: "Ctrl+A", click: "core:select-all" },
 			],
 		},
 
 		{
 			label: "&View",
 			submenu: [
-				{label:"&Reload", accelerator:"Ctrl+R", click:"window:reload"},
-				{label:"Toggle &Full Screen", accelerator:"Ctrl+Shift+F", click:"window:toggle-full-screen"},
+				{ label: "&Reload", accelerator: "Ctrl+R", click: "window:reload" },
+				{ label: "Toggle &Full Screen", accelerator: "Ctrl+Shift+F", click: "window:toggle-full-screen" },
 				{
 					label: "Developer",
 					submenu: [
-						//TODO: {label:"Run Tests...", accelerator:"Ctrl+Shift+T", click:"application:run-specs"},
-						{label:"Toggle Developer &Tools", accelerator:"Ctrl+Shift+I", click:"window:toggle-dev-tools"},
+						//TODO: { label: "Run Tests...", accelerator: "Ctrl+Shift+T", click: "application:run-specs" },
+						{ label: "Toggle Developer &Tools", accelerator: "Ctrl+Shift+I", click: "window:toggle-dev-tools" },
 					],
 				},
 			],
@@ -43,7 +43,7 @@ module.exports = function(pkg) {
 		{
 			label: "&Help",
 			submenu: [
-				{label:`About ${pkg.productName}`, click:"application:about"},
+				{ label: `About ${pkg.productName}`, click: "application:about" },
 			],
 		},
 

diff --git a/src/app/menus/win32.js b/src/app/menus/win32.js
@@ -7,35 +7,35 @@ module.exports = function(pkg) {
 		{
 			label: "&File",
 			submenu: [
-				{label:"&Options", click:"application:show-settings"},
-				{type:"separator"},
-				{label:"E&xit", accelerator:"Alt+F4", click:"application:quit"},
+				{ label: "&Options", click: "application:show-settings" },
+				{ type: "separator" },
+				{ label: "E&xit", accelerator: "Alt+F4", click: "application:quit" },
 			],
 		},
 
 		{
 			label: "&Edit",
 			submenu: [
-				{label:"&Undo", accelerator:"Ctrl+Z", click:"core:undo"},
-				{label:"&Redo", accelerator:"Ctrl+Y", click:"core:redo"},
-				{type:"separator"},
-				{label:"&Cut", accelerator:"Ctrl+X", click:"core:cut"},
-				{label:"C&opy", accelerator:"Ctrl+C", click:"core:copy"},
-				{label:"&Paste", accelerator:"Ctrl+V", click:"core:paste"},
-				{label:"Select &All", accelerator:"Ctrl+A", click:"core:select-all"},
+				{ label: "&Undo", accelerator: "Ctrl+Z", click: "core:undo" },
+				{ label: "&Redo", accelerator: "Ctrl+Y", click: "core:redo" },
+				{ type: "separator" },
+				{ label: "&Cut", accelerator: "Ctrl+X", click: "core:cut" },
+				{ label: "C&opy", accelerator: "Ctrl+C", click: "core:copy" },
+				{ label: "&Paste", accelerator: "Ctrl+V", click: "core:paste" },
+				{ label: "Select &All", accelerator: "Ctrl+A", click: "core:select-all" },
 			],
 		},
 
 		{
 			label: "&View",
 			submenu: [
-				{label:"&Reload", accelerator:"Ctrl+R", click:"window:reload"},
-				{label:"Toggle &Full Screen", accelerator:"Ctrl+Shift+F", click:"window:toggle-full-screen"},
+				{ label: "&Reload", accelerator: "Ctrl+R", click: "window:reload" },
+				{ label: "Toggle &Full Screen", accelerator: "Ctrl+Shift+F", click: "window:toggle-full-screen" },
 				{
 					label: "Developer",
 					submenu: [
-						//TODO: {label:"Run Tests...", accelerator:"Ctrl+Shift+T", click:"application:run-specs"},
-						{label:"Toggle Developer &Tools", accelerator:"Ctrl+Shift+I", click:"window:toggle-dev-tools"},
+						//TODO: { label: "Run Tests...", accelerator: "Ctrl+Shift+T", click: "application:run-specs" },
+						{ label: "Toggle Developer &Tools", accelerator: "Ctrl+Shift+I", click: "window:toggle-dev-tools" },
 					],
 				},
 			],
@@ -44,7 +44,7 @@ module.exports = function(pkg) {
 		{
 			label: "&Help",
 			submenu: [
-				{label:`About ${pkg.productName}`, click:"application:about"},
+				{ label: `About ${pkg.productName}`, click: "application:about" },
 			],
 		},
 

diff --git a/src/web/components/data/json.js b/src/web/components/data/json.js
@@ -13,7 +13,7 @@ angular.module("mw.components.data.json", [
 	//TODO: `JSON.parse` support (the below `parse` is good but probably unreasonably heavy in some scenarios)
 
 	Number.prototype.toJSON = function toJSON() { //eslint-disable-line no-extend-native
-		return isNaN(this) ? {$nan: 1} : this;
+		return isNaN(this) ? { $nan: 1 } : this;
 	};
 	parsersByKeys.$nan = Number.parseJSON = function parseJSON(obj) {
 		return obj.$nan ? NaN : obj;

diff --git a/src/web/components/data/mongo.js b/src/web/components/data/mongo.js
@@ -197,7 +197,7 @@ angular.module("mw.components.data.mongo", [
 		},
 
 
-		update: function update(dbUrl, collectionName, selector, update, options) {
+		update: function update(dbUrl, collectionName, selector, updates, options) {
 			return $q(function(resolve, reject) {
 				if (typeof dbUrl !== "string") dbUrl = MongoSvc.getDbUrl(dbUrl);
 				if (!collectionName) return reject(new Error("required `collectionName`"));
@@ -206,7 +206,7 @@ angular.module("mw.components.data.mongo", [
 				mongodb.MongoClient.connect(dbUrl, function(err, db) {
 					if (err) return reject(err);
 					var collection = db.collection(collectionName);
-					collection.update(selector, update, options, function(err2, results) {
+					collection.update(selector, updates, options, function(err2, results) {
 						if (err2) return reject(err2);
 						return resolve({
 							result: results.result,

diff --git a/src/web/index.js b/src/web/index.js
@@ -11,12 +11,7 @@ angular.module("mw", [
 ])
 
 
-.controller("IndexCtrl",
-["$scope",
-function($scope) {
-
-
-	if (typeof global === "undefined") window.global = window;
+.controller("IndexCtrl", function($scope) {
 
 
 	$scope.ctrl = {};
@@ -29,16 +24,15 @@ function($scope) {
 		database: {},
 		collection: {},
 	};
-	$scope.model = angular.extend({}, modelDefaults, $scope.model || {}, global.model || {});
-	global.model = $scope.model; // persist global app state between refreshes
+	$scope.model = angular.extend({}, modelDefaults, $scope.model || {});
 
 
 	$scope.viewModel = {
 		tabs: {},
 	};
 
 
-	$scope.$watch("model.tabName", function(tabName, oldTabName) {
+	$scope.$watch("model.tabName", function(tabName) {
 		if (!tabName) return;
 		var tabs = {};
 		tabs[tabName] = true;
@@ -66,5 +60,4 @@ function($scope) {
 			}
 		});
 
-},
-]);
+});