aboutsummaryrefslogtreecommitdiffstats
path: root/src/JSON.js
diff options
context:
space:
mode:
authorIgor Minar2010-08-16 10:56:03 -0700
committerIgor Minar2010-08-16 10:56:03 -0700
commit59401b80ee36d56f7ede551669633abbc6dd1e24 (patch)
tree113669e99faae192d0bb89adc4f74db6f22fefd0 /src/JSON.js
parent9899959d695a97ddbb3e9a626a769efa714bffe7 (diff)
parentf09415d0de5d383efc9e2cb35d1323a5aac2371d (diff)
downloadangular.js-59401b80ee36d56f7ede551669633abbc6dd1e24.tar.bz2
Merge remote branch 'upstream/master'
Diffstat (limited to 'src/JSON.js')
-rw-r--r--src/JSON.js6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/JSON.js b/src/JSON.js
index ba3d700e..49ed0b29 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -1,4 +1,4 @@
-array = [].constructor;
+var array = [].constructor;
function toJson(obj, pretty){
var buf = [];
@@ -6,10 +6,6 @@ function toJson(obj, pretty){
return buf.join('');
}
-function toPrettyJson(obj) {
- return toJson(obj, true);
-}
-
function fromJson(json) {
if (!json) return json;
try {