hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-04 17:11:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-enable prefer-const rule

Browse source
This commit is contained in:
Oliver Blanthorn 2020-06-18 18:28:10 +01:00
parent 2edc03b821
commit 5c3c16d376
No known key found for this signature in database
GPG key ID: 2BB8C36BB504BFF3
4 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.eslintrc.js
View file

@ -224,7 +224,7 @@ module.exports = {
],
"prefer-arrow/prefer-arrow-functions": "off",
"prefer-const": [
"off", //"error",
"error",
{
"destructuring": "all"
}

2
src/content/toys.ts
View file

@ -20,7 +20,7 @@ export function no_mouse() {
rain([" "], "#FFF", 0) // No characters, unused colour code, no darkening
}
export let snow = () => rain(["❄"], "#FFF", 0.15)
export const snow = () => rain(["❄"], "#FFF", 0.15)
export function rain(characters: string[], colour, darkening = 0.05) {
const d = document.createElement("div")

3
src/excmds.ts
View file

@ -2322,8 +2322,7 @@ export async function fullscreen() {
export async function tabclose(...indexes: string[]) {
let done
if (indexes.length > 0) {
let ids: number[]
ids = await Promise.all(indexes.map(index => idFromIndex(index)))
const ids = await Promise.all(indexes.map(index => idFromIndex(index)))
done = browser.tabs.remove(ids)
} else {
// Close current tab

29
src/lib/html-tagged-template.js
View file

@ -272,19 +272,19 @@
// template tags allow any HTML (even <tr> elements out of context)
// @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/template
let template = document.createElement("template")
const template = document.createElement("template")
template.innerHTML = str
// find all substitution values and safely encode them using DOM APIs and
// contextual auto-escaping
let walker = document.createNodeIterator(
const walker = document.createNodeIterator(
template.content,
NodeFilter.SHOW_ALL,
)
let node
while ((node = walker.nextNode())) {
let tag = null
let attributesToRemove = []
const attributesToRemove = []
// --------------------------------------------------
// node name substitution
@ -319,7 +319,7 @@
// tag and append its contents which will make it execute correctly.
// @see http://stackoverflow.com/questions/1197575/can-scripts-be-inserted-with-innerhtml
else if (node.nodeName === "SCRIPT") {
let script = document.createElement("script")
const script = document.createElement("script")
tag = script
node._replacedWith = script
@ -338,20 +338,20 @@
// object so the loop will still work as expected.
if (!(node.attributes instanceof NamedNodeMap)) {
// first clone the node so we can isolate it from any children
let temp = node.cloneNode()
const temp = node.cloneNode()
// parse the node string for all attributes
let attributeMatches = temp.outerHTML.match(
const attributeMatches = temp.outerHTML.match(
ATTRIBUTE_PARSER_REGEX,
)
// get all attribute names and their value
attributes = []
for (let i = 0; i < attributeMatches.length; i++) {
let attributeName = attributeMatches[i]
for (const attribute of attributeMatches.length) {
const attributeName = attribute
.trim()
.split("=")[0]
let attributeValue = node.getAttribute(
const attributeValue = node.getAttribute(
attributeName,
)
@ -367,8 +367,7 @@
attributes = Array.from(node.attributes)
}
for (let i = 0; i < attributes.length; i++) {
let attribute = attributes[i]
for (const attribute of attributes) {
let name = attribute.name
let value = attribute.value
let hasSubstitution = false
@ -431,7 +430,7 @@
CUSTOM_URI_ATTRIBUTES_REGEX.test(name)
) {
// percent encode if the value is inside of a query parameter
let queryParamIndex = value.indexOf("=")
const queryParamIndex = value.indexOf("=")
if (
queryParamIndex !== -1 &&
offset > queryParamIndex
@ -506,7 +505,7 @@
// all of that for us
// @see https://www.mediawiki.org/wiki/DOM-based_XSS
if (tag || hasSubstitution) {
let el = tag || node
const el = tag || node
// optional attribute
if (name.substr(-1) === "?") {
@ -553,13 +552,13 @@
node.nodeType === 3 &&
node.nodeValue.indexOf(SUBSTITUTION_INDEX) !== -1
) {
let nodeValue = node.nodeValue.replace(
const nodeValue = node.nodeValue.replace(
SUBSTITUTION_REGEX,
replaceSubstitution,
)
// createTextNode() should not need to be escaped to prevent XSS?
let text = document.createTextNode(nodeValue)
const text = document.createTextNode(nodeValue)
// since the parent node has already gone through the iterator, we can use
// replaceChild() here