Merge pull request #1542 from UziTech/update-eslint

Update eslint
markedjs · Sep 8, 2019 · bbc4576 · bbc4576 · vercel · Sep 8, 2019
2 parents b2f80b8 + bb4b579
commit bbc4576
Show file tree

Hide file tree

Showing 5 changed files with 187 additions and 184 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -19,7 +19,8 @@
     "no-cond-assign": "off",
     "no-useless-escape": "off",
     "one-var": "off",
-    "no-control-regex": "off"
+    "no-control-regex": "off",
+    "no-prototype-builtins": "off"
   },
   "env": {
     "node": true,

diff --git a/docs/demo/demo.js b/docs/demo/demo.js
@@ -122,7 +122,7 @@ function setInitialVersion() {
           return res.json();
         })
         .then(function(json) {
-          markedVersions['master'] = 'https://cdn.jsdelivr.net/gh/markedjs/marked@' + json[0].sha + '/lib/marked.js';
+          markedVersions.master = 'https://cdn.jsdelivr.net/gh/markedjs/marked@' + json[0].sha + '/lib/marked.js';
         })
         .catch(function() {
           // do nothing