Permalink
Browse files

Upgrade Underscore and JSON2 to latest versions

  • Loading branch information...
joecorcoran committed Feb 27, 2013
1 parent a5e9706 commit b5821cfc02b215e32fca5e488c534004983cc3e9
Showing with 455 additions and 290 deletions.
  1. +4 −5 vendor/assets/javascripts/json2.js
  2. +451 −285 vendor/assets/javascripts/underscore.js
@@ -1,6 +1,6 @@
/*
- http://www.JSON.org/json2.js
- 2011-10-19
+ json2.js
+ 2012-10-08
Public Domain.
@@ -159,8 +159,7 @@
// Create a JSON object only if one does not already exist. We create the
// methods in a closure to avoid creating global variables.
-var JSON;
-if (!JSON) {
+if (typeof JSON !== 'object') {
JSON = {};
}
@@ -484,4 +483,4 @@ if (!JSON) {
throw new SyntaxError('JSON.parse');
};
}
-}());
+}());
Oops, something went wrong.

0 comments on commit b5821cf

Please sign in to comment.