From 4e303cc592652831ce18bd48d65eb8f983d5ab79 Mon Sep 17 00:00:00 2001
From: Alexander Lin <lin.alexander.2011@gmail.com>
Date: Sat, 10 Dec 2016 02:14:30 -0800
Subject: [PATCH] Clean up code

---
 .../spec/controllers/inventoryCtrlSpec.js     |  6 +++---
 .../js/controllers/inventoryCtrl.js           | 19 +++++--------------
 .../views/options/inventory/equipment.jade    |  4 ++--
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/test/client-old/spec/controllers/inventoryCtrlSpec.js b/test/client-old/spec/controllers/inventoryCtrlSpec.js
index 5639fb6dc5..92f4d2818f 100644
--- a/test/client-old/spec/controllers/inventoryCtrlSpec.js
+++ b/test/client-old/spec/controllers/inventoryCtrlSpec.js
@@ -471,11 +471,11 @@ describe('Inventory Controller', function() {
                     'not': [wrap('chicken'), wrap('sashimi')]};
       scope.gearByClass = gearByClass;
       scope.gearByType = gearByType;
-      scope.equipmentFilterQuery.query = 'a';
+      scope.equipmentQuery.query = 'a';
     });
 
     it('filters nothing if equipmentQuery is nothing', function() {
-      scope.equipmentFilterQuery.query = '';
+      scope.equipmentQuery.query = '';
       scope.$digest();
       expect(toText(scope.filteredGearByClass['raw'])).to.eql(['kale', 'sashimi']);
       expect(toText(scope.filteredGearByClass['cooked'])).to.eql(['chicken', 'potato']);
@@ -509,7 +509,7 @@ describe('Inventory Controller', function() {
     });
 
     it('filters out gear if filter query changes', function() {
-      scope.equipmentFilterQuery.query = 'c';
+      scope.equipmentQuery.query = 'c';
       scope.$digest();
 
       expect(toText(scope.filteredGearByClass['raw'])).to.eql([]);
diff --git a/website/client-old/js/controllers/inventoryCtrl.js b/website/client-old/js/controllers/inventoryCtrl.js
index d7175a5832..6644921f77 100644
--- a/website/client-old/js/controllers/inventoryCtrl.js
+++ b/website/client-old/js/controllers/inventoryCtrl.js
@@ -8,7 +8,7 @@ habitrpg.controller("InventoryCtrl",
 
     $scope.selectedEgg = null; // {index: 1, name: "Tiger", value: 5}
     $scope.selectedPotion = null; // {index: 5, name: "Red", value: 3}
-    $scope.equipmentFilterQuery = {'query': ''};
+    $scope.equipmentQuery = {'query': ''};
 
     _updateDropAnimalCount(user.items);
 
@@ -120,15 +120,15 @@ habitrpg.controller("InventoryCtrl",
     }
 
     $scope.$watch(function(){
-        return ['gearByClass', 'gearByType', 'equipmentFilterQuery'].map(angular.bind($scope, $scope.$eval));
+        return ['gearByClass', 'gearByType', 'equipmentQuery'].map(angular.bind($scope, $scope.$eval));
       }, function(updatedVals) {
         var gearByClass = updatedVals[0];
         var gearByType = updatedVals[1];
-        var equipmentFilterQuery = updatedVals[2];
-        $scope.updateEquipment(gearByClass, gearByType, equipmentFilterQuery.query);
+        var equipmentQuery = updatedVals[2];
+        $scope.updateEquipment(gearByClass, gearByType, equipmentQuery.query);
       }, true);
 
-    $scope.updateEquipment($scope.gearByClass, $scope.gearByType, $scope.equipmentFilterQuery.query);
+    $scope.updateEquipment($scope.gearByClass, $scope.gearByType, $scope.equipmentQuery.query);
 
     $scope.chooseEgg = function(egg){
       if ($scope.selectedEgg && $scope.selectedEgg.key == egg) {
@@ -465,12 +465,3 @@ habitrpg.controller("InventoryCtrl",
     }
   }
 ]);
-habitrpg.controller("InventorySearchCtrl",
-  ['$scope',
-  function($scope) {
-    $scope.equipmentFilterQuery.query = '';
-    $scope.updateEquipmentQuery = function() {
-      $scope.equipmentFilterQuery.query = $scope.equipmentQuery;
-    }
-  }
-]);
diff --git a/website/views/options/inventory/equipment.jade b/website/views/options/inventory/equipment.jade
index 1872e4d801..380de2d55c 100644
--- a/website/views/options/inventory/equipment.jade
+++ b/website/views/options/inventory/equipment.jade
@@ -43,10 +43,10 @@ mixin equipmentList(equipmentType)
 .container-fluid
   .row
     .col-md-6
-      .input-group.equipment-search(ng-controller="InventorySearchCtrl")
+      .input-group.equipment-search
         .input-group-addon
           .glyphicon.glyphicon-search
-        input.form-control(type='text', placeholder=env.t('search'), ng-model='equipmentQuery', ng-change='updateEquipmentQuery()', ng-model-options='{ debounce: 250 }')
+        input.form-control(type='text', placeholder=env.t('search'), ng-model='equipmentQuery.query', ng-model-options='{ debounce: 250 }')
   .row
     .col-md-6.border-right(ng-controller="SortableInventoryController")
       h3.equipment-title.hint(popover-trigger='mouseenter',