alex/yomichan
1
Fork 0
Code Releases Activity

Add no-shadow

Browse Source
This commit is contained in:
toasted-nutbread 2020-02-17 15:21:30 -05:00
parent b3212d776e
commit c0d91bffc4
8 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.json
View File

@ -26,6 +26,7 @@
"no-const-assign": "error",
"no-constant-condition": "off",
"no-global-assign": "error",
"no-shadow": ["error", {"builtinGlobals": false}],
"no-undef": "error",
"no-unneeded-ternary": "error",
"no-unused-vars": ["error", {"vars": "local", "args": "after-used", "argsIgnorePattern": "^_", "caughtErrors": "none"}],

32
ext/bg/js/backend.js
View File

@ -274,18 +274,18 @@ class Backend {
const node = nodes.pop();
for (const key of Object.keys(node.obj)) {
const path = node.path.concat(key);
const obj = node.obj[key];
if (obj !== null && typeof obj === 'object') {
nodes.unshift({obj, path});
const obj2 = node.obj[key];
if (obj2 !== null && typeof obj2 === 'object') {
nodes.unshift({obj: obj2, path});
} else {
valuePaths.push([obj, path]);
valuePaths.push([obj2, path]);
}
}
}
return valuePaths;
}
function modifyOption(path, value, options) {
function modifyOption(path, value) {
let pivot = options;
for (const key of path.slice(0, -1)) {
if (!hasOwn(pivot, key)) {
@ -298,7 +298,7 @@ class Backend {
}
for (const [value, path] of getValuePaths(changedOptions)) {
modifyOption(path, value, options);
modifyOption(path, value);
}
await this._onApiOptionsSave({source});
@ -340,9 +340,9 @@ class Backend {
dictTermsSort(definitions);
const {expression, reading} = definitions[0];
const source = text.substring(0, sourceLength);
for (const {text, furigana} of jpDistributeFuriganaInflected(expression, reading, source)) {
const reading = jpConvertReading(text, furigana, options.parsing.readingMode);
term.push({text, reading});
for (const {text: text2, furigana} of jpDistributeFuriganaInflected(expression, reading, source)) {
const reading2 = jpConvertReading(text2, furigana, options.parsing.readingMode);
term.push({text: text2, reading: reading2});
}
text = text.substring(source.length);
} else {
@ -365,17 +365,17 @@ class Backend {
for (const {expression, reading, source} of parsedLine) {
const term = [];
if (expression !== null && reading !== null) {
for (const {text, furigana} of jpDistributeFuriganaInflected(
for (const {text: text2, furigana} of jpDistributeFuriganaInflected(
expression,
jpKatakanaToHiragana(reading),
source
)) {
const reading = jpConvertReading(text, furigana, options.parsing.readingMode);
term.push({text, reading});
const reading2 = jpConvertReading(text2, furigana, options.parsing.readingMode);
term.push({text: text2, reading: reading2});
}
} else {
const reading = jpConvertReading(source, null, options.parsing.readingMode);
term.push({text: source, reading});
const reading2 = jpConvertReading(source, null, options.parsing.readingMode);
term.push({text: source, reading: reading2});
}
result.push(term);
}
@ -816,12 +816,12 @@ class Backend {
try {
const tabWindow = await new Promise((resolve, reject) => {
chrome.windows.get(tab.windowId, {}, (tabWindow) => {
chrome.windows.get(tab.windowId, {}, (value) => {
const e = chrome.runtime.lastError;
if (e) {
reject(e);
} else {
resolve(tabWindow);
resolve(value);
}
});
});

4
ext/bg/js/database.js
View File

@ -809,9 +809,9 @@ class Database {
for (const objectStoreName of objectStoreNames) {
const {primaryKey, indices} = stores[objectStoreName];
const objectStoreNames = transaction.objectStoreNames || db.objectStoreNames;
const objectStoreNames2 = transaction.objectStoreNames || db.objectStoreNames;
const objectStore = (
Database._listContains(objectStoreNames, objectStoreName) ?
Database._listContains(objectStoreNames2, objectStoreName) ?
transaction.objectStore(objectStoreName) :
db.createObjectStore(objectStoreName, primaryKey)
);

12
ext/bg/js/japanese.js
View File

@ -224,15 +224,15 @@ function jpDistributeFurigana(expression, reading) {
}
let isAmbiguous = false;
const segmentize = (reading, groups) => {
const segmentize = (reading2, groups) => {
if (groups.length === 0 || isAmbiguous) {
return [];
}
const group = groups[0];
if (group.mode === 'kana') {
if (jpKatakanaToHiragana(reading).startsWith(jpKatakanaToHiragana(group.text))) {
const readingLeft = reading.substring(group.text.length);
if (jpKatakanaToHiragana(reading2).startsWith(jpKatakanaToHiragana(group.text))) {
const readingLeft = reading2.substring(group.text.length);
const segs = segmentize(readingLeft, groups.splice(1));
if (segs) {
return [{text: group.text}].concat(segs);
@ -240,9 +240,9 @@ function jpDistributeFurigana(expression, reading) {
}
} else {
let foundSegments = null;
for (let i = reading.length; i >= group.text.length; --i) {
const readingUsed = reading.substring(0, i);
const readingLeft = reading.substring(i);
for (let i = reading2.length; i >= group.text.length; --i) {
const readingUsed = reading2.substring(0, i);
const readingLeft = reading2.substring(i);
const segs = segmentize(readingLeft, groups.slice(1));
if (segs) {
if (foundSegments !== null) {

2
ext/bg/js/json-schema.js
View File

@ -401,7 +401,7 @@ class JsonSchemaProxyHandler {
info.valuePush(i, propertyValue);
JsonSchemaProxyHandler.validate(propertyValue, propertySchema, info);
info.valuePop();
for (let i = 0; i < schemaPath.length; ++i) { info.schemaPop(); }
for (let j = 0, jj = schemaPath.length; j < jj; ++j) { info.schemaPop(); }
}
}

4
ext/bg/js/search.js
View File

@ -70,7 +70,7 @@ class DisplaySearch extends Display {
this.wanakanaEnable.checked = false;
}
this.wanakanaEnable.addEventListener('change', (e) => {
const {queryParams: {query=''}} = parseUrl(window.location.href);
const {queryParams: {query: query2=''}} = parseUrl(window.location.href);
if (e.target.checked) {
window.wanakana.bind(this.query);
apiOptionsSet({general: {enableWanakana: true}}, this.getOptionsContext());
@ -78,7 +78,7 @@ class DisplaySearch extends Display {
window.wanakana.unbind(this.query);
apiOptionsSet({general: {enableWanakana: false}}, this.getOptionsContext());
}
this.setQuery(query);
this.setQuery(query2);
this.onSearchQueryUpdated(this.query.value, false);
});
}

2
ext/bg/js/settings/dictionaries.js
View File

@ -166,7 +166,7 @@ class SettingsDictionaryListUI {
delete n.dataset.dict;
$(n).modal('hide');
const index = this.dictionaryEntries.findIndex((e) => e.dictionaryInfo.title === title);
const index = this.dictionaryEntries.findIndex((entry) => entry.dictionaryInfo.title === title);
if (index >= 0) {
this.dictionaryEntries[index].deleteDictionary();
}

6
ext/mixed/js/core.js
View File

@ -160,9 +160,9 @@ function promiseTimeout(delay, resolveValue) {
const resolve = (value) => complete(promiseResolve, value);
const reject = (value) => complete(promiseReject, value);
const promise = new Promise((resolve, reject) => {
promiseResolve = resolve;
promiseReject = reject;
const promise = new Promise((resolve2, reject2) => {
promiseResolve = resolve2;
promiseReject = reject2;
});
timer = window.setTimeout(() => {
timer = null;