From 61922d78cda777e44f72fe486f784b3a6948f6c8 Mon Sep 17 00:00:00 2001
From: Michael Krotscheck <krotscheck@gmail.com>
Date: Wed, 4 Mar 2015 16:08:01 -0800
Subject: [PATCH] Enabled eslint:no-shadow
Rule enabled, discovered issues resolved.
Change-Id: I037bb430d69ea5a50a9127278a1eba698868bf25
---
.eslintrc | 1 -
.../project_group_edit_controller.js | 18 +++++++++---------
test/integration/services/module.js | 4 ++--
test/unit/services/module.js | 4 ++--
4 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/.eslintrc b/.eslintrc
index f7150ec5..8317547a 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -53,7 +53,6 @@
// Rules to be processed.
"no-use-before-define": 0,
"space-infix-ops": 0,
- "no-shadow": 0,
// Stylistic
"indent": [2, 4],
diff --git a/src/app/admin/controller/project_group_edit_controller.js b/src/app/admin/controller/project_group_edit_controller.js
index c1d3062f..d68aac98 100644
--- a/src/app/admin/controller/project_group_edit_controller.js
+++ b/src/app/admin/controller/project_group_edit_controller.js
@@ -118,7 +118,7 @@ angular.module('sb.admin').controller('ProjectGroupEditController',
idsToDelete.forEach(function (id) {
// Get a deferred promise...
- var deferred = $q.defer();
+ var removeProjectDeferred = $q.defer();
// Construct the item.
var item = new ProjectGroupItem({
@@ -128,23 +128,23 @@ angular.module('sb.admin').controller('ProjectGroupEditController',
// Delete the item.
item.$delete(function (result) {
- deferred.resolve(result);
+ removeProjectDeferred.resolve(result);
},
function (error) {
- deferred.reject(error);
+ removeProjectDeferred.reject(error);
}
);
- promises.push(deferred.promise);
+ promises.push(removeProjectDeferred.promise);
});
// Intersect current vs. loaded to get a list of project
- // reference to delete.
+ // reference to add.
var idsToAdd = ArrayUtil.difference(desiredIds, loadedIds);
idsToAdd.forEach(function (id) {
// Get a deferred promise...
- var deferred = $q.defer();
+ var addProjectDeferred = $q.defer();
// Construct the item.
var item = new ProjectGroupItem({
@@ -154,14 +154,14 @@ angular.module('sb.admin').controller('ProjectGroupEditController',
// Delete the item.
item.$create(function (result) {
- deferred.resolve(result);
+ addProjectDeferred.resolve(result);
},
function (error) {
- deferred.reject(error);
+ addProjectDeferred.reject(error);
}
);
- promises.push(deferred.promise);
+ promises.push(addProjectDeferred.promise);
});
diff --git a/test/integration/services/module.js b/test/integration/services/module.js
index 4fa4cdd2..4e2bcc22 100644
--- a/test/integration/services/module.js
+++ b/test/integration/services/module.js
@@ -20,8 +20,8 @@ describe('sb.services', function () {
var module;
var dependencies = [];
- var hasModule = function (module) {
- return dependencies.indexOf(module) >= 0;
+ var hasModule = function (moduleName) {
+ return dependencies.indexOf(moduleName) >= 0;
};
beforeEach(function () {
diff --git a/test/unit/services/module.js b/test/unit/services/module.js
index 6cda8422..986d6308 100644
--- a/test/unit/services/module.js
+++ b/test/unit/services/module.js
@@ -20,8 +20,8 @@ describe('sb.services', function () {
var module;
var dependencies = [];
- var hasModule = function (module) {
- return dependencies.indexOf(module) >= 0;
+ var hasModule = function (moduleName) {
+ return dependencies.indexOf(moduleName) >= 0;
};
beforeEach(function () {