Merge branch 'master' into 'develop'

Master See merge request !24

Merge branch 'master' into 'develop'
Master See merge request !24
Eric Fernandez
2 parents 596fa760d6 afeb8c8f78
Showing 2 changed files Show diff stats
src/js/controllerModal.js
src/views/foca-modal.html
@@ -197,5 +197,9 @@ angular.module(&#39;focaModal&#39;)
                 }
             }
             $scope.busquedaPress(13);
+
+            $scope.clearInput = function(){
+                $scope.filters = '';
+            };
         }]
     );
@@ -18,6 +18,14 @@
                 ng-focus="selectedEntidad = -1"
                 teclado-virtual
             >
+            <button 
+                ng-show="filters.length >= 1"
+                type="button"
+                class="clear-input"
+                ng-click="clearInput()"
+            >
+                <i class="fa fa-times"></i>
+            </button>
             <div class="input-group-append">
                 <button
                     ladda="searchLoading"