JSON Fixes

PrismJS · Dec 29, 2015 · ad2fcd0 · ad2fcd0
1 parent db367b0
commit ad2fcd0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/components.js b/components.js
@@ -184,7 +184,7 @@ var components = {
 		"json": {
 			"title": "JSON",
 			"option": "default",
-            "owner": "CupOfTea696"
+			"owner": "CupOfTea696"
 		},
 		"julia": {
 			"title": "Julia",

diff --git a/components/prism-json.js b/components/prism-json.js
@@ -1,13 +1,7 @@
 Prism.languages.json = {
-    'property': /"(\b|\B)[\w-]+"(?=\s*:)/ig,
-    'string': /"(?!:)(\\?[^'"])*?"(?!:)/g,
+    'property': /".*?"(?=\s*:)/ig,
+    'string': /"(?!:)(\\?[^"])*?"(?!:)/g,
     'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,
-    'function': {
-		pattern: /[a-z0-9_]+\(/ig,
-		inside: {
-			punctuation: /\(/
-		}
-	},
     'punctuation': /[{}[\]);,]/g,
     'operator': /:/g,
     'boolean': /\b(true|false)\b/gi,

diff --git a/components/prism-json.min.js b/components/prism-json.min.js