diff options
author | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2020-09-04 18:19:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-04 18:19:43 -0400 |
commit | dd8e32e7c40011de95e6c81211e2b434be2fde78 (patch) | |
tree | e9247c8f5c62b21efd46dfa13d24dc73ccbd01dd | |
parent | 1cc9f4b1a480396f8e9cea23ebb1d410b048a518 (diff) |
Fix template renderer sandbox compatibility (#770)
* Use Object.prototype.hasOwnProperty.call instead of hasOwn
* Disable WebExtension and core.js APIs for template-renderer.js
-rw-r--r-- | .eslintrc.json | 10 | ||||
-rw-r--r-- | ext/bg/js/template-renderer.js | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/.eslintrc.json b/.eslintrc.json index 558fd928..7f52702c 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -84,14 +84,20 @@ }, "overrides": [ { - "files": ["ext/mixed/js/core.js"], + "files": [ + "ext/mixed/js/core.js", + "ext/bg/js/template-renderer.js" + ], "env": { "webextensions": false } }, { "files": ["ext/**/*.js"], - "excludedFiles": ["ext/mixed/js/core.js"], + "excludedFiles": [ + "ext/mixed/js/core.js", + "ext/bg/js/template-renderer.js" + ], "globals": { "errorToJson": "readonly", "jsonToError": "readonly", diff --git a/ext/bg/js/template-renderer.js b/ext/bg/js/template-renderer.js index 1f68e3e0..5dd33814 100644 --- a/ext/bg/js/template-renderer.js +++ b/ext/bg/js/template-renderer.js @@ -43,7 +43,7 @@ class TemplateRenderer { } const markerPre = data.marker; - const markerPreHas = hasOwn(data, 'marker'); + const markerPreHas = Object.prototype.hasOwnProperty.call(data, 'marker'); try { this._stateStack = [new Map()]; data.marker = marker; |