Merge branch 'master' into 'master'

Master See merge request !5

Merge branch 'master' into 'master'
Master See merge request !5
Eric Fernandez
2 parents 155974d4b9 cb25bbd6d6
Showing 2 changed files Show diff stats
src/js/controllerModal.js
src/js/service.js
@@ -38,6 +38,7 @@ angular.module(&#39;focaModal&#39;)
                     );
                 }
             };
+            $scope.busquedaPress(13);
  
             $scope.search = function(pressed) {
                 if($scope.entidades.length > 0) {
@@ -31,11 +31,13 @@ angular.module(&#39;focaModal&#39;)
                             }
                         );
                 },
-                modal: function(columnas, query, titulo) {
+                modal: function(columnas, query, titulo, size) {
+                    size = (typeof size  === 'undefined') ? 'lg' : size;
+
                     return $uibModal.open({
                         templateUrl: 'foca-modal.html',
                         controller: 'focaModalController',
-                        size: 'lg',
+                        size: size,
                         resolve: {
                             columnas: function() { return columnas; },
                             query: function() { return query; },
...	...	@@ -38,6 +38,7 @@ angular.module('focaModal')
38	38	);
39	39	}
40	40	};
	41	+ $scope.busquedaPress(13);
41	42
42	43	$scope.search = function(pressed) {
43	44	if($scope.entidades.length > 0) {
...	...	@@ -31,11 +31,13 @@ angular.module('focaModal')
31	31	}
32	32	);
33	33	},
34		- modal: function(columnas, query, titulo) {
	34	+ modal: function(columnas, query, titulo, size) {
	35	+ size = (typeof size === 'undefined') ? 'lg' : size;
	36	+
35	37	return $uibModal.open({
36	38	templateUrl: 'foca-modal.html',
37	39	controller: 'focaModalController',
38		- size: 'lg',
	40	+ size: size,
39	41	resolve: {
40	42	columnas: function() { return columnas; },
41	43	query: function() { return query; },