fixed formatting issue for negatives numbers with decimals

FCSAmerica · Oct 17, 2014 · d74370f · d74370f
1 parent 8214ba3
commit d74370f
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 9 deletions.
diff --git a/CHANGLOG.md b/CHANGLOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### 1.5.3
+
+* Bug Fixes
+  * Fixed a bug where `-1.2` was being formatted as `-1-1.2`
+
 ### 1.5.2
 
 * Bug Fixes

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -17,6 +17,11 @@ module.exports = (grunt) ->
       build:
         src: 'src/fcsaNumber.js'
         dest: 'src/fcsaNumber.min.js'
+    file_append:
+      default_options:
+        files:
+          'src/fcsaNumber.js':
+            prepend: '/*! <%= pkg.name %> (version <%= pkg.version %>) <%= grunt.template.today("yyyy-mm-dd") %> */\n'
     copy:
       web_angular:
         src: 'bower_components/angular/angular.js'
@@ -62,5 +67,5 @@ module.exports = (grunt) ->
 
   require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks)
 
-  grunt.registerTask 'default', ['coffee', 'uglify', 'copy:web_angular', 'copy:web_fcsaNumber']
+  grunt.registerTask 'default', ['coffee', 'uglify', 'file_append', 'copy:web_angular', 'copy:web_fcsaNumber']
   grunt.registerTask 'e2e', ['default', 'express', 'shell:protractor']
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-fcsa-number",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "authors": [
     "Paul Yoder <paulyoder@gmail.com>"
   ],

diff --git a/e2e/web/public/fcsaNumber.js b/e2e/web/public/fcsaNumber.js
@@ -1,3 +1,4 @@
+/*! angular-fcsa-number (version 1.5.3) 2014-10-17 */
 (function() {
   var fcsaNumberModule,
     __hasProp = {}.hasOwnProperty;
@@ -97,7 +98,7 @@
       };
       addCommasToInteger = function(val) {
         var commas, decimals, wholeNumbers;
-        decimals = val.indexOf('.') == -1 ? '' : val.replace(/^\d+(?=\.)/, '');
+        decimals = val.indexOf('.') == -1 ? '' : val.replace(/^-?\d+(?=\.)/, '');
         wholeNumbers = val.replace(/(\.\d+)$/, '');
         commas = wholeNumbers.replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
         return "" + commas + decimals;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-fcsa-number",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "An Angular directive that validates numbers and adds commas for the thousands separator.",
   "author": "https://github.com/FCSAmericaDev/fcsa-number/graphs/contributors",
   "license": "MIT",
@@ -19,7 +19,8 @@
     "grunt-contrib-copy": "~0.5",
     "express": "~4.x",
     "grunt-express-server": "~0.4.17",
-    "grunt-shell": "~0.7.0"
+    "grunt-shell": "~0.7.0",
+    "grunt-file-append": "0.0.5"
   },
   "scripts": {
     "test": "grunt --verbose"

diff --git a/src/fcsaNumber.coffee b/src/fcsaNumber.coffee
@@ -66,7 +66,7 @@ fcsaNumberModule.directive 'fcsaNumber',
             true
 
     addCommasToInteger = (val) ->
-        decimals = `val.indexOf('.') == -1 ? '' : val.replace(/^\d+(?=\.)/, '')`
+        decimals = `val.indexOf('.') == -1 ? '' : val.replace(/^-?\d+(?=\.)/, '')`
         wholeNumbers = val.replace /(\.\d+)$/, ''
         commas = wholeNumbers.replace /(\d)(?=(\d{3})+(?!\d))/g, '$1,'
         "#{commas}#{decimals}"

diff --git a/src/fcsaNumber.js b/src/fcsaNumber.js
@@ -1,3 +1,4 @@
+/*! angular-fcsa-number (version 1.5.3) 2014-10-17 */
 (function() {
   var fcsaNumberModule,
     __hasProp = {}.hasOwnProperty;
@@ -97,7 +98,7 @@
       };
       addCommasToInteger = function(val) {
         var commas, decimals, wholeNumbers;
-        decimals = val.indexOf('.') == -1 ? '' : val.replace(/^\d+(?=\.)/, '');
+        decimals = val.indexOf('.') == -1 ? '' : val.replace(/^-?\d+(?=\.)/, '');
         wholeNumbers = val.replace(/(\.\d+)$/, '');
         commas = wholeNumbers.replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
         return "" + commas + decimals;

diff --git a/src/fcsaNumber.min.js b/src/fcsaNumber.min.js
diff --git a/test/fcsaNumber.spec.coffee b/test/fcsaNumber.spec.coffee
@@ -43,6 +43,17 @@ describe 'fcsaNumber', ->
       angular.element(el).triggerHandler 'blur'
       expect(el.value).toBe '1,000'
 
+    describe 'with negative decimal number', ->
+      it 'correctly formats it', ->
+        $scope.model.number = -1000.2
+        el = $compile("<input type='text' name='number' ng-model='model.number' fcsa-number />")($scope)
+        el = el[0]
+        $scope.$digest()
+        angular.element(document.body).append el
+        angular.element(el).triggerHandler 'focus'
+        angular.element(el).triggerHandler 'blur'
+        expect(el.value).toBe '-1,000.2'
+
     describe 'when more than 3 decimals', ->
       it 'does not add commas to the decimals', ->
         $scope.model.number = 1234.5678

diff --git a/test/fcsaNumber.spec.js b/test/fcsaNumber.spec.js
@@ -51,6 +51,19 @@
         angular.element(el).triggerHandler('blur');
         return expect(el.value).toBe('1,000');
       });
+      describe('with negative decimal number', function() {
+        return it('correctly formats it', function() {
+          var el;
+          $scope.model.number = -1000.2;
+          el = $compile("<input type='text' name='number' ng-model='model.number' fcsa-number />")($scope);
+          el = el[0];
+          $scope.$digest();
+          angular.element(document.body).append(el);
+          angular.element(el).triggerHandler('focus');
+          angular.element(el).triggerHandler('blur');
+          return expect(el.value).toBe('-1,000.2');
+        });
+      });
       return describe('when more than 3 decimals', function() {
         return it('does not add commas to the decimals', function() {
           var el;