Commit ad2fcd01984ba0aae3744be0c60244a424617078
2015-12-29T15:54:51
JSON Fixes
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/components.js b/components.js
index 61316cf..a748628 100644
--- 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
index 979c21a..c7634b1 100644
--- 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
index 7b92d09..adf9403 100644
--- a/components/prism-json.min.js
+++ b/components/prism-json.min.js
@@ -1,2 +1 @@
-Prism.languages.json={property:/"(\b|\B)[\w-]+"(?=\s*:)/gi,string:/"(?!:)(\\?[^'"])*?"(?!:)/g,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,"function":{pattern:/[a-z0-9_]+\(/gi,inside:{punctuation:/\(/}},punctuation:/[{}[\]);,]/g,operator:/:/g,"boolean":/\b(true|false)\b/gi,"null":/\bnull\b/gi},Prism.languages.jsonp=Prism.languages.json;
-//# sourceMappingURL=./prism-json.min.js.map
\ No newline at end of file
+Prism.languages.json={property:/".*?"(?=\s*:)/gi,string:/"(?!:)(\\?[^"])*?"(?!:)/g,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,punctuation:/[{}[\]);,]/g,operator:/:/g,"boolean":/\b(true|false)\b/gi,"null":/\bnull\b/gi},Prism.languages.jsonp=Prism.languages.json;
\ No newline at end of file