feat(ui-br-phone-number): preserve the original model type

assisrafael · Jun 7, 2015 · 340ee6d · 340ee6d
1 parent 20517ea
commit 340ee6d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/br/phone/br-phone.js b/src/br/phone/br-phone.js
@@ -9,7 +9,7 @@ function BrPhoneNumberDirective() {
 		phoneMask9D = new StringMask('(00) 00000-0000');
 
 	function removeNonDigits(value) {
-		return value.replace(/[^0-9]/g, '');
+		return value.toString().replace(/[^0-9]/g, '');
 	}
 
 	function applyPhoneMask(value) {
@@ -49,11 +49,12 @@ function BrPhoneNumberDirective() {
 					ctrl.$render();
 				}
 
-				return actualValue;
+				return angular.isNumber(ctrl.$modelValue) ? parseInt(actualValue) : actualValue;
 			}
 
 			function validator(value) {
-				var valid = ctrl.$isEmpty(value) || value.length === 10 || value.length === 11;
+				var valueLength = value && value.toString().length;
+				var valid = ctrl.$isEmpty(value) || valueLength === 10 || valueLength === 11;
 				ctrl.$setValidity('brPhoneNumber', valid);
 				return value;
 			}

diff --git a/src/br/phone/br-phone.test.js b/src/br/phone/br-phone.test.js
@@ -68,4 +68,17 @@ describe('ui-br-phone-number', function() {
 		input.val('12345678901').triggerHandler('input');
 		expect(model.$error.brPhoneNumber).toBe(false);
 	});
+
+	it('should use the type of the model value (if initialized)', function() {
+		var input = TestUtil.compile('<input ng-model="model" ui-br-phone-number>', {
+			model: 1234567890
+		});
+
+		var model = input.controller('ngModel');
+		expect(model.$viewValue).toBe('(12) 3456-7890');
+		expect(model.$modelValue).toBe(1234567890);
+		input.val('12345678901').triggerHandler('input');
+		expect(model.$viewValue).toBe('(12) 34567-8901');
+		expect(model.$modelValue).toBe(12345678901);
+	});
 });