alex/yomichan
1
Fork 0
Code Releases Activity

Fix template renderer sandbox compatibility (#770)

Browse Source 
* Use Object.prototype.hasOwnProperty.call instead of hasOwn

* Disable WebExtension and core.js APIs for template-renderer.js
This commit is contained in:
toasted-nutbread 2020-09-04 18:19:43 -04:00 committed by GitHub
parent 1cc9f4b1a4
commit dd8e32e7c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.eslintrc.json
View File

@ -84,14 +84,20 @@
}, },
"overrides": [ "overrides": [
{ {
"files": ["ext/mixed/js/core.js"], "files": [
"ext/mixed/js/core.js",
"ext/bg/js/template-renderer.js"
],
"env": { "env": {
"webextensions": false "webextensions": false
} }
}, },
{ {
"files": ["ext/**/*.js"], "files": ["ext/**/*.js"],
"excludedFiles": ["ext/mixed/js/core.js"], "excludedFiles": [
"ext/mixed/js/core.js",
"ext/bg/js/template-renderer.js"
],
"globals": { "globals": {
"errorToJson": "readonly", "errorToJson": "readonly",
"jsonToError": "readonly", "jsonToError": "readonly",

2
ext/bg/js/template-renderer.js
View File

@ -43,7 +43,7 @@ class TemplateRenderer {
} }
const markerPre = data.marker; const markerPre = data.marker;
const markerPreHas = hasOwn(data, 'marker'); const markerPreHas = Object.prototype.hasOwnProperty.call(data, 'marker');
try { try {
this._stateStack = [new Map()]; this._stateStack = [new Map()];
data.marker = marker; data.marker = marker;