Merge branch 'master' into 'develop'

Master(efernandez) See merge request !35

Merge branch 'master' into 'develop'
Master(efernandez) See merge request !35
Eric Fernandez
2 parents 5a6b514e61 747b28e47f
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/modal-prompt.html
@@ -42,6 +42,10 @@ angular.module(&#39;focaModal&#39;)
     function($uibModalInstance, $scope, options, focaModalService) {
  
         $scope.options = options;
+
+        if (!$scope.options.tipo) {
+            $scope.options.tipo = 'text'
+        }
         $scope.cancelar = function() {
             $uibModalInstance.dismiss();
         };
@@ -3,7 +3,7 @@
 </div>
 <div class="modal-body">
     <input 
-        type="text" 
+        type="{{options.tipo}}" 
         class="form-control"
         ng-model="options.value"
         ng-show="!options.textarea"
...	...	@@ -42,6 +42,10 @@ angular.module('focaModal')
42	42	function($uibModalInstance, $scope, options, focaModalService) {
43	43
44	44	$scope.options = options;
	45	+
	46	+ if (!$scope.options.tipo) {
	47	+ $scope.options.tipo = 'text'
	48	+ }
45	49	$scope.cancelar = function() {
46	50	$uibModalInstance.dismiss();
47	51	};