diff options
| -rw-r--r-- | src/JSON.js | 2 | ||||
| -rw-r--r-- | src/filters.js | 3 | ||||
| -rw-r--r-- | test/AngularSpec.js | 6 | ||||
| -rw-r--r-- | test/JsonSpec.js | 4 |
4 files changed, 6 insertions, 9 deletions
diff --git a/src/JSON.js b/src/JSON.js index 1dc5cc03..7fdbf1a1 100644 --- a/src/JSON.js +++ b/src/JSON.js @@ -126,7 +126,7 @@ function toJsonArray(buf, obj, pretty, stack) { var childPretty = pretty ? pretty + " " : false; var keys = []; for(var k in obj) { - if (obj.hasOwnProperty(k) && obj[k] !== undefined) { + if (k!='this' && k!='$parent' && k.substring(0,2) != '$$' && obj.hasOwnProperty(k) && obj[k] !== undefined) { keys.push(k); } } diff --git a/src/filters.js b/src/filters.js index 6a136f92..c5d886ea 100644 --- a/src/filters.js +++ b/src/filters.js @@ -254,7 +254,6 @@ var GET_TIME_ZONE = /[A-Z]{3}(?![+\-])/, OPERA_TOSTRING_PATTERN = /^[\d].*Z$/, NUMBER_STRING = /^\d+$/; - /** * @workInProgress * @ngdoc filter @@ -409,7 +408,7 @@ angularFilter.date = function(date, format) { */ angularFilter.json = function(object) { this.$element.addClass("ng-monospace"); - return toJson(object, true); + return toJson(object, true, /^(\$|this$)/); }; diff --git a/test/AngularSpec.js b/test/AngularSpec.js index 9f77d3ea..9a1a20c7 100644 --- a/test/AngularSpec.js +++ b/test/AngularSpec.js @@ -514,12 +514,6 @@ describe('angular', function(){ expect(angular.scope().$service('svc2')).toEqual('svc2-svc1'); }); - it('should inject infered dependencies when $inject is missing', function() { - angular.service('svc1', function() { return 'svc1'; }); - angular.service('svc2', function(svc1) { return 'svc2-' + svc1; }); - expect(angular.scope().$service('svc2')).toEqual('svc2-svc1'); - }); - it('should eagerly instantiate a service if $eager is true', function() { var log = []; angular.service('svc1', function() { log.push('svc1'); }, {$eager: true}); diff --git a/test/JsonSpec.js b/test/JsonSpec.js index d9b245f9..b0bb15bc 100644 --- a/test/JsonSpec.js +++ b/test/JsonSpec.js @@ -11,6 +11,10 @@ describe('json', function(){ expect(toJson("a \t \n \r b \\")).toEqual('"a \\t \\n \\r b \\\\"'); }); + it('should not serialize $$properties', function(){ + expect(toJson({$$some:'value', 'this':1, '$parent':1}, false)).toEqual('{}'); + }); + it('should serialize strings with escaped characters', function() { expect(toJson("7\\\"7")).toEqual("\"7\\\\\\\"7\""); }); |