Merge branch 'master' into 'master'

Master See merge request !3

Merge branch 'master' into 'master'
Master See merge request !3
Eric Fernandez
2 parents b6f171fafd 6dadcfc6e1
Showing 1 changed file Show diff stats
src/js/uppercaseOnly-directive.js
@@ -25,7 +25,9 @@ angular.module(&#39;focaDirectivas&#39;)
                         return value.toUpperCase();
                     }
  
-                    if(attrs.type === 'text') {
+                    if(attrs.type === 'text' &&
+                        !attrs.readonly &&
+                        !attrs.disabled) {
  
                         ctrl.$formatters.push(formatter);
                         ctrl.$parsers.push(parser);
...	...	@@ -25,7 +25,9 @@ angular.module('focaDirectivas')
25	25	return value.toUpperCase();
26	26	}
27	27
28		- if(attrs.type === 'text') {
	28	+ if(attrs.type === 'text' &&
	29	+ !attrs.readonly &&
	30	+ !attrs.disabled) {
29	31
30	32	ctrl.$formatters.push(formatter);
31	33	ctrl.$parsers.push(parser);