From 134452582c5c1c8e9c0d4dc150609b8b3fa2c8ca Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 4 Mar 2016 13:10:23 -0800 Subject: [PATCH] [Build] Remove/qualify for-in usages --- .../capabilities/EditableLookupCapability.js | 2 +- .../src/controllers/SearchMenuController.js | 6 ++---- .../controllers/SearchMenuControllerSpec.js | 20 +++++++------------ 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/platform/commonUI/edit/src/capabilities/EditableLookupCapability.js b/platform/commonUI/edit/src/capabilities/EditableLookupCapability.js index a0c8add0c3..0abde97c5a 100644 --- a/platform/commonUI/edit/src/capabilities/EditableLookupCapability.js +++ b/platform/commonUI/edit/src/capabilities/EditableLookupCapability.js @@ -24,7 +24,7 @@ define( [], function () { - + /*jshint forin:false */ /** * Wrapper for both "context" and "composition" capabilities; * ensures that any domain objects reachable in Edit mode diff --git a/platform/search/src/controllers/SearchMenuController.js b/platform/search/src/controllers/SearchMenuController.js index 154f746a53..2f369929ab 100644 --- a/platform/search/src/controllers/SearchMenuController.js +++ b/platform/search/src/controllers/SearchMenuController.js @@ -90,12 +90,10 @@ define(function () { // For documentation, see checkAll below function checkAll() { - var type; - // Reset all the other options to original/default position - for (type in $scope.ngModel.checked) { + Object.keys($scope.ngModel.checked).forEach(function (type) { $scope.ngModel.checked[type] = false; - } + }); // Change the filters string depending on checkAll status if ($scope.ngModel.checkAll) { diff --git a/platform/search/test/controllers/SearchMenuControllerSpec.js b/platform/search/test/controllers/SearchMenuControllerSpec.js index bff6dab569..68f8930431 100644 --- a/platform/search/test/controllers/SearchMenuControllerSpec.js +++ b/platform/search/test/controllers/SearchMenuControllerSpec.js @@ -87,24 +87,20 @@ define( }); it("checking checkAll option resets other options", function () { - var type; - mockScope.ngModel.checked['mock.type.1'] = true; mockScope.ngModel.checked['mock.type.2'] = true; controller.checkAll(); - - for (type in mockScope.ngModel.checked) { + + Object.keys(mockScope.ngModel.checked).forEach(function (type) { expect(mockScope.ngModel.checked[type]).toBeFalsy(); - } + }); }); it("tells the user when no options are checked", function () { - var type; - - for (type in mockScope.ngModel.checked) { + Object.keys(mockScope.ngModel.checked).forEach(function (type) { mockScope.ngModel.checked[type] = false; - } + }); mockScope.ngModel.checkAll = false; controller.updateOptions(); @@ -113,12 +109,10 @@ define( }); it("tells the user when options are checked", function () { - var type; - mockScope.ngModel.checkAll = false; - for (type in mockScope.ngModel.checked) { + Object.keys(mockScope.ngModel.checked).forEach(function (type) { mockScope.ngModel.checked[type] = true; - } + }); controller.updateOptions();