Merge branch 'master' into 'develop'

Master See merge request !18

Merge branch 'master' into 'develop'
Master See merge request !18
Jose Pinto
2 parents 00cd65d4b4 dc9bd8372e
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/modal-prompt.html
@@ -40,7 +40,7 @@ angular.module(&#39;focaModal&#39;)
 .controller('focaModalPromptController', [
     '$uibModalInstance', '$scope', 'options', 'focaModalService',
     function($uibModalInstance, $scope, options, focaModalService) {
-
+        
         $scope.options = options;
         $scope.cancelar = function() {
             $uibModalInstance.dismiss();
@@ -51,7 +51,6 @@ angular.module(&#39;focaModal&#39;)
                     focaModalService.alert('Ingrese email/s válido/s');
                     return;
                 }
-    
                 $uibModalInstance.close($scope.options.value);
             }
         };
@@ -7,6 +7,7 @@
         class="form-control"
         ng-model="options.value"
         ng-show="!options.textarea"
+        maxlength="{{options.maxlength}}"
         ng-readonly="options.readonly"
         ng-keypress="aceptar($event.keyCode)">
  
@@ -15,6 +16,7 @@
         class="form-control text-uppercase"
         ng-model="options.value"
         ng-show="options.textarea"
+        maxlength="{{options.maxlength}}"
         ng-readonly="options.readonly"
         ng-keypress="aceptar($event.keyCode)"></textarea>
 </div>
...	...	@@ -40,7 +40,7 @@ angular.module('focaModal')
40	40	.controller('focaModalPromptController', [
41	41	'$uibModalInstance', '$scope', 'options', 'focaModalService',
42	42	function($uibModalInstance, $scope, options, focaModalService) {
43		-
	43	+
44	44	$scope.options = options;
45	45	$scope.cancelar = function() {
46	46	$uibModalInstance.dismiss();
...	...	@@ -51,7 +51,6 @@ angular.module('focaModal')
51	51	focaModalService.alert('Ingrese email/s válido/s');
52	52	return;
53	53	}
54		-
55	54	$uibModalInstance.close($scope.options.value);
56	55	}
57	56	};
...	...	@@ -7,6 +7,7 @@
7	7	class="form-control"
8	8	ng-model="options.value"
9	9	ng-show="!options.textarea"
	10	+ maxlength="{{options.maxlength}}"
10	11	ng-readonly="options.readonly"
11	12	ng-keypress="aceptar($event.keyCode)">
12	13
...	...	@@ -15,6 +16,7 @@
15	16	class="form-control text-uppercase"
16	17	ng-model="options.value"
17	18	ng-show="options.textarea"
	19	+ maxlength="{{options.maxlength}}"
18	20	ng-readonly="options.readonly"
19	21	ng-keypress="aceptar($event.keyCode)"></textarea>
20	22	</div>