refactor(toJson): remove breaking change from previous CL

Closes #10297
angular · Dec 2, 2014 · 9a616ea · 9a616ea
1 parent 7daf4e0
commit 9a616ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Angular.js b/src/Angular.js
@@ -970,7 +970,10 @@ function toJsonReplacer(key, value) {
  */
 function toJson(obj, pretty) {
   if (typeof obj === 'undefined') return undefined;
-  return JSON.stringify(obj, toJsonReplacer, pretty === true ? 2 : pretty);
+  if (!isNumber(pretty)) {
+    pretty = pretty ? 2 : null;
+  }
+  return JSON.stringify(obj, toJsonReplacer, pretty);
 }
 
 

diff --git a/test/AngularSpec.js b/test/AngularSpec.js
@@ -1189,7 +1189,7 @@ describe('angular', function() {
     });
 
 
-    iit('should format objects pretty', function() {
+    it('should format objects pretty', function() {
       expect(toJson({a: 1, b: 2}, true)).
           toBe('{\n  "a": 1,\n  "b": 2\n}');
       expect(toJson({a: {b: 2}}, true)).
@@ -1200,6 +1200,8 @@ describe('angular', function() {
           toBe('{"a":1,"b":2}');
       expect(toJson({a: 1, b: 2}, 1)).
           toBe('{\n "a": 1,\n "b": 2\n}');
+      expect(toJson({a: 1, b: 2}, {})).
+          toBe('{\n  "a": 1,\n  "b": 2\n}');
     });