diff options
| author | Andres Ornelas | 2010-08-04 11:45:42 -0700 |
|---|---|---|
| committer | Andres Ornelas | 2010-08-04 11:45:42 -0700 |
| commit | ec12285c9d213a50b86b2ff8d968686acd6d1693 (patch) | |
| tree | 94c0792946bfa461c4fab525b3758b06c6da9f9f /src/formatters.js | |
| parent | ef88eb9a71ee7666029c4fb5eb731ce2e986cecc (diff) | |
| parent | 89245f3a527415a80d46b37054b558454c314532 (diff) | |
| download | angular.js-ec12285c9d213a50b86b2ff8d968686acd6d1693.tar.bz2 | |
Merge branch 'master' of github.com:angular/angular.js into future
Diffstat (limited to 'src/formatters.js')
| -rw-r--r-- | src/formatters.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/formatters.js b/src/formatters.js index 40462cf3..ca1ce83e 100644 --- a/src/formatters.js +++ b/src/formatters.js @@ -5,6 +5,7 @@ var NUMBER = /^\s*[-+]?\d*(\.\d*)?\s*$/; extend(angularFormatter, { 'noop':formatter(identity, identity), + 'json':formatter(toJson, fromJson), 'boolean':formatter(toString, toBoolean), 'number':formatter(toString, function(obj){ |