Merge remote-tracking branch 'upstream/master'

Jose Pinto
2 parents ff4f683623 57950e99cc
Showing 1 changed file Show diff stats
src/js/uppercaseOnly-directive.js
@@ -7,7 +7,7 @@ angular.module(&#39;focaDirectivas&#39;)
                 link: function(scope, element, attrs, ctrl) {
  
                     function parser(value) {
-                        if (ctrl.$isEmpty(value)) {
+                        if (ctrl.$isEmpty(value) || angular.isDate(value)) {
                             return value;
                         }
                         var formatedValue = value.toUpperCase();
...	...	@@ -7,7 +7,7 @@ angular.module('focaDirectivas')
7	7	link: function(scope, element, attrs, ctrl) {
8	8
9	9	function parser(value) {
10		- if (ctrl.$isEmpty(value)) {
	10	+ if (ctrl.$isEmpty(value) \|\| angular.isDate(value)) {
11	11	return value;
12	12	}
13	13	var formatedValue = value.toUpperCase();