Merge pull request uPortal-Attic#48 from UW-Madison-DoIT/MUMUP-1292

MUMUP-1292: Fix search on mobile

Author: Tim Levett

js/main/main-controllers.js

@@ -51,20 +51,17 @@
     });
   }]);
 
-  /* Search */
-
-  app.controller('SearchController', [ '$scope', '$location', 'marketplaceService', function($scope, $location, marketplaceService) {
-      $scope.submit = function(){
-        if($scope.initialFilter != "") {
-          marketplaceService.initialFilter($scope.initialFilter);
-          $location.path("/apps/search/"+ $scope.initialFilter);
-          $scope.initialFilter = "";
-        }
-      };
-    } ]);
-
-  app.controller('HeaderController', [ '$scope', function($scope) {
+  /* Header */
+  app.controller('HeaderController', ['$scope','$location', 'marketplaceService', function($scope, $location, marketplaceService) {
     $scope.showSearch = false;
+    $scope.submit = function(){
+      if($scope.initialFilter != "") {
+        marketplaceService.initialFilter($scope.initialFilter);
+        $location.path("/apps/search/"+ $scope.initialFilter);
+        $scope.initialFilter = "";
+        $scope.showSearch = false;
+      }
+    };
   }]);
 
 

partials/search.html

@@ -1,4 +1,4 @@
-<form ng-submit="submit()" ng-controller="SearchController as searchCtrl">
+<form ng-submit="submit()">
     <p>
       <input type="search" class="main-search" placeholder="Search MyUW" name="initialFilter" ng-model="initialFilter">
       <span class="glyphicon glyphicon-search"></span>