@@ -25,8 +25,8 @@ angular.module('ui.utils.masks.global.number', [
25
25
var viewMask = NumberMasks . viewMask ( decimals , decimalDelimiter , thousandsDelimiter ) ,
26
26
modelMask = NumberMasks . modelMask ( decimals ) ;
27
27
28
- function parse ( value ) {
29
- if ( ! value ) {
28
+ function parser ( value ) {
29
+ if ( ctrl . $isEmpty ( value ) ) {
30
30
return value ;
31
31
}
32
32
@@ -54,21 +54,22 @@ angular.module('ui.utils.masks.global.number', [
54
54
return actualNumber ;
55
55
}
56
56
57
- ctrl . $formatters . push ( function ( value ) {
57
+ function formatter ( value ) {
58
+ if ( ctrl . $isEmpty ( value ) ) {
59
+ return value ;
60
+ }
61
+
58
62
var prefix = '' ;
59
63
if ( angular . isDefined ( attrs . uiNegativeNumber ) && value < 0 ) {
60
64
prefix = '-' ;
61
65
}
62
66
63
- if ( ! value ) {
64
- return value ;
65
- }
66
-
67
67
var valueToFormat = PreFormatters . prepareNumberToFormatter ( value , decimals ) ;
68
68
return prefix + viewMask . apply ( valueToFormat ) ;
69
- } ) ;
69
+ }
70
70
71
- ctrl . $parsers . push ( parse ) ;
71
+ ctrl . $formatters . push ( formatter ) ;
72
+ ctrl . $parsers . push ( parser ) ;
72
73
73
74
if ( attrs . uiNumberMask ) {
74
75
scope . $watch ( attrs . uiNumberMask , function ( decimals ) {
@@ -78,7 +79,7 @@ angular.module('ui.utils.masks.global.number', [
78
79
viewMask = NumberMasks . viewMask ( decimals , decimalDelimiter , thousandsDelimiter ) ;
79
80
modelMask = NumberMasks . modelMask ( decimals ) ;
80
81
81
- parse ( ctrl . $viewValue || '' ) ;
82
+ parser ( ctrl . $viewValue ) ;
82
83
} ) ;
83
84
}
84
85
0 commit comments