diff options
author | Adam Kocoloski <adam@cloudant.com> | 2011-08-15 15:45:15 -0400 |
---|---|---|
committer | Adam Kocoloski <adam@cloudant.com> | 2011-08-15 15:45:15 -0400 |
commit | 6ffe1675dd7b004e48891956a6bdbe32899ce80c (patch) | |
tree | 57326d9a498481e65bb0db38c66daf10896801f1 /couchjs/js/json2.js | |
parent | 52ff89ff7996e839b9e2f91fd76184d362a8aeb0 (diff) | |
parent | fdd1a5d0bc48b49b0df5c9217beff9574011283c (diff) |
Merge branch '11554-merge-couchdb-1.1'
Diffstat (limited to 'couchjs/js/json2.js')
-rw-r--r-- | couchjs/js/json2.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/couchjs/js/json2.js b/couchjs/js/json2.js index 39d8f370..a1a3b170 100644 --- a/couchjs/js/json2.js +++ b/couchjs/js/json2.js @@ -1,6 +1,6 @@ /* http://www.JSON.org/json2.js - 2009-09-29 + 2010-03-20 Public Domain. @@ -433,6 +433,7 @@ if (!this.JSON) { // Unicode characters with escape sequences. JavaScript handles many characters // incorrectly, either silently deleting them, or treating them as line endings. + text = String(text); cx.lastIndex = 0; if (cx.test(text)) { text = text.replace(cx, function (a) { |