Fixed a case where JSON would fail to parse if a string containing a …

…number also contained escaped quotes.

Fixes #141.

CHANGELOG.md

@@ -1,3 +1,7 @@
+JSONView 1.2.2
+---
+* Fixed a case where JSON would fail to parse if a string containing a number also contained escaped quotes.
+
 JSONView 1.2.1
 ---
 * Fixed a case where JSON would fail to parse if a string contains a number and the JSON isn't indented.

lib/jsonview.js

@@ -102,7 +102,17 @@ var JSONView = Class({
     // This has some memory of what its last state was
     var wasInQuotes = false;
     function isInsideQuotes(str) {
-      var inQuotes = (str.match(quoteFinder) || []).length % 2 === 1;
+      var inQuotes = false;
+      for (var i = 0; i < str.length; i++) {
+        if (str[i] === '"') {
+          var escaped =
+                (i > 0 && str[i - 1] === '\\') &&
+                (i > 1 || str[i - 2] !== '\\');
+          if (!escaped) {
+            inQuotes = !inQuotes;
+          }
+        }
+      }
       if (wasInQuotes) {
         inQuotes = !inQuotes;
       }

package.json

@@ -1,6 +1,6 @@
 {
   "id": "[email protected]",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "name": "jsonview",
   "title": "JSONView",
   "description": "View JSON documents in the browser.",

tests/issue141.json

@@ -0,0 +1 @@
+{ "value":[ { "@some.text":"W/\"12241774\"" } ] }

tests/issue141b.json

@@ -0,0 +1 @@
+{ "12\"":"W/\"12241774\"" }