Auto stash before merge of "master" and "upstream/master"

Jose Pinto
1 parent 50a0d78717
Showing 2 changed files with 4 additions and 3 deletions Show diff stats
src/js/controller.js
src/views/modal-vehiculo.html
@@ -42,13 +42,14 @@ angular.module(&#39;focaModalVehiculo&#39;)
                             {$: $scope.filters}
                         );
  
-                        if(pressed && $scope.filteredVehiculos.length === 0) {
+                        if(pressed && $scope.filteredVehiculos.length === 0){
                             $timeout(function() {
                                 angular.element('#search')[0].focus();
                                 $scope.filters = '';
                             });
                         }
  
+
                         $scope.lastPage = Math.ceil(
                             $scope.filteredVehiculos.length / $scope.numPerPage
                         );
@@ -7,9 +7,9 @@
             <input
                 ladda="searchLoading"
                 type="text"
-                class="form-control form-control-sm"
+                class="form-control"
                 id="search"
-                placeholder="Búsqueda"
+                placeholder="Busqueda"
                 ng-model="filters"
                 ng-change="search()"
                 ng-keydown="busquedaDown($event.keyCode)"
...	...	@@ -42,13 +42,14 @@ angular.module('focaModalVehiculo')
42	42	{$: $scope.filters}
43	43	);
44	44
45		- if(pressed && $scope.filteredVehiculos.length === 0) {
	45	+ if(pressed && $scope.filteredVehiculos.length === 0){
46	46	$timeout(function() {
47	47	angular.element('#search')[0].focus();
48	48	$scope.filters = '';
49	49	});
50	50	}
51	51
	52	+
52	53	$scope.lastPage = Math.ceil(
53	54	$scope.filteredVehiculos.length / $scope.numPerPage
54	55	);
...	...	@@ -7,9 +7,9 @@
7	7	<input
8	8	ladda="searchLoading"
9	9	type="text"
10		- class="form-control form-control-sm"
	10	+ class="form-control"
11	11	id="search"
12		- placeholder="Búsqueda"
	12	+ placeholder="Busqueda"
13	13	ng-model="filters"
14	14	ng-change="search()"
15	15	ng-keydown="busquedaDown($event.keyCode)"