added description for padding, fixed a bug where numbers without specifiers where padded;

sevensc · sevensc · commit e2d8315f82be · 2018-02-01T10:33:34.000+01:00
diff --git a/dist/index.js b/dist/index.js
@@ -117,7 +117,7 @@ var String = (function () {
             default:
                 break;
         }
-        if (typeof (arg) === 'number' || !isNaN(arg))
+        if ((typeof (arg) === 'number' || !isNaN(arg)) && !isNaN(+match))
             return String.formatNumber(arg, match);
         return arg;
     };
diff --git a/dist/index.ts b/dist/index.ts
@@ -120,8 +120,8 @@ export class String {
             default:
                 break;
         }
-
-        if (typeof (arg) === 'number' || !isNaN(arg))
+        
+        if ((typeof (arg) === 'number' || !isNaN(arg)) && !isNaN(+match))
             return String.formatNumber(arg, match);
 
         return arg;
@@ -167,7 +167,7 @@ export class String {
 
     private static formatNumber(input: number, formatTemplate: string): string {
         let count = formatTemplate.length;
-        let stringValue = input.toString();
+        let stringValue = input.toString();   
         if (count <= stringValue.length)
             return stringValue;
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript-string-operations",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Simple lightweight string operation library for Typescript, works with Angular",
   "main": "dist/index.min.js",  
   "scripts": {
diff --git a/readme.md b/readme.md
@@ -40,6 +40,9 @@ value = String.Format("{0:s}", "21.03.2017 22:15:01") //output "2017-03-21T22:15
 
 value = String.Format("{0:n}", 1000000);
 //output "1.000.000"
+
+value = String.Format("{0:00}", 1);
+//output "01"
 ```
 
 |	Specifier	  |	 			Result 	   	    |
@@ -49,6 +52,7 @@ value = String.Format("{0:n}", 1000000);
 |		`d`		  |	ShortDatePattern			|
 |		`s`		  |	SortableDateTimePattern		|
 |		`n`		  |	Thousand seperator			|
+|		`00`	  |	Padding numbers				|
 
 
 
diff --git a/tests/test.html b/tests/test.html
@@ -0,0 +1,4 @@
+<html>
+    <script>var exports = {};</script>
+    <script src="../dist/index.js"></script>    
+</html>
diff --git a/tests/tests.ts b/tests/tests.ts
@@ -117,6 +117,13 @@ describe('String.Format', () => {
         });
 
         describe('numbers', () => {
+
+            it('should not pad without specifier using {0}', () => {
+                let template = '{0}';
+                let result = String.Format(template, 5);
+                expect(result).to.equal('5');
+            });
+            
             it('should pad 5 to 05 using {0:00}', () => {
                 let template = '{0:00}';
                 let result = String.Format(template, 5);

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ var String = (function () {`
`117`	`117`	`default:`
`118`	`118`	`break;`
`119`	`119`	`}`
`120`		`- if (typeof (arg) === 'number' \|\| !isNaN(arg))`
	`120`	`+ if ((typeof (arg) === 'number' \|\| !isNaN(arg)) && !isNaN(+match))`
`121`	`121`	`return String.formatNumber(arg, match);`
`122`	`122`	`return arg;`
`123`	`123`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "typescript-string-operations",`
`3`		`- "version": "1.2.2",`
	`3`	`+ "version": "1.2.3",`
`4`	`4`	`"description": "Simple lightweight string operation library for Typescript, works with Angular",`
`5`	`5`	`"main": "dist/index.min.js",`
`6`	`6`	`"scripts": {`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<html>
 +    <script>var exports = {};</script>
 +    <script src="../dist/index.js"></script>
 +</html>