Replace string.substr and string.slice with string.substring
Improves semantic clarity, and it's recommended to not use substr.
This commit is contained in:
parent
eef05f6a64
commit
cf18e3b42e
@ -128,7 +128,7 @@ function audioUrlNormalize(url, baseUrl, basePath) {
|
|||||||
if (url[0] === '/') {
|
if (url[0] === '/') {
|
||||||
if (url.length >= 2 && url[1] === '/') {
|
if (url.length >= 2 && url[1] === '/') {
|
||||||
// Begins with "//"
|
// Begins with "//"
|
||||||
url = baseUrl.substr(0, baseUrl.indexOf(':') + 1) + url;
|
url = baseUrl.substring(0, baseUrl.indexOf(':') + 1) + url;
|
||||||
} else {
|
} else {
|
||||||
// Begins with "/"
|
// Begins with "/"
|
||||||
url = baseUrl + url;
|
url = baseUrl + url;
|
||||||
|
@ -44,7 +44,7 @@ class Deinflector {
|
|||||||
|
|
||||||
results.push({
|
results.push({
|
||||||
source,
|
source,
|
||||||
term: term.slice(0, -kanaIn.length) + kanaOut,
|
term: term.substring(0, term.length - kanaIn.length) + kanaOut,
|
||||||
rules: rulesOut,
|
rules: rulesOut,
|
||||||
definitions: [],
|
definitions: [],
|
||||||
reasons: [reason, ...reasons]
|
reasons: [reason, ...reasons]
|
||||||
|
@ -207,7 +207,7 @@ class DisplaySearch extends Display {
|
|||||||
const match = /[\*\uff0a]+$/.exec(query);
|
const match = /[\*\uff0a]+$/.exec(query);
|
||||||
if (match !== null) {
|
if (match !== null) {
|
||||||
details.wildcard = true;
|
details.wildcard = true;
|
||||||
query = query.substr(0, query.length - match[0].length);
|
query = query.substring(0, query.length - match[0].length);
|
||||||
}
|
}
|
||||||
|
|
||||||
const valid = (query.length > 0);
|
const valid = (query.length > 0);
|
||||||
|
@ -327,22 +327,22 @@ class Translator {
|
|||||||
const deinflections = [];
|
const deinflections = [];
|
||||||
|
|
||||||
for (let i = text.length; i > 0; --i) {
|
for (let i = text.length; i > 0; --i) {
|
||||||
const textSlice = text.slice(0, i);
|
const textSubstring = text.substring(0, i);
|
||||||
deinflections.push(...this.deinflector.deinflect(textSlice));
|
deinflections.push(...this.deinflector.deinflect(textSubstring));
|
||||||
}
|
}
|
||||||
|
|
||||||
return deinflections;
|
return deinflections;
|
||||||
}
|
}
|
||||||
|
|
||||||
getDeinflections2(text, text2) {
|
getDeinflections2(text1, text2) {
|
||||||
const deinflections = [];
|
const deinflections = [];
|
||||||
|
|
||||||
for (let i = text.length; i > 0; --i) {
|
for (let i = text1.length; i > 0; --i) {
|
||||||
const textSlice = text.slice(0, i);
|
const text1Substring = text1.substring(0, i);
|
||||||
const text2Slice = text2.slice(0, i);
|
const text2Substring = text2.substring(0, i);
|
||||||
deinflections.push(...this.deinflector.deinflect(textSlice));
|
deinflections.push(...this.deinflector.deinflect(text1Substring));
|
||||||
if (textSlice !== text2Slice) {
|
if (text1Substring !== text2Substring) {
|
||||||
deinflections.push(...this.deinflector.deinflect(text2Slice));
|
deinflections.push(...this.deinflector.deinflect(text2Substring));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -516,6 +516,6 @@ class Translator {
|
|||||||
|
|
||||||
static getNameBase(name) {
|
static getNameBase(name) {
|
||||||
const pos = name.indexOf(':');
|
const pos = name.indexOf(':');
|
||||||
return (pos >= 0 ? name.substr(0, pos) : name);
|
return (pos >= 0 ? name.substring(0, pos) : name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -391,7 +391,7 @@ class Popup {
|
|||||||
static isOnExtensionPage() {
|
static isOnExtensionPage() {
|
||||||
try {
|
try {
|
||||||
const url = chrome.runtime.getURL('/');
|
const url = chrome.runtime.getURL('/');
|
||||||
return window.location.href.substr(0, url.length) === url;
|
return window.location.href.substring(0, url.length) === url;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// NOP
|
// NOP
|
||||||
}
|
}
|
||||||
|
@ -75,7 +75,7 @@ class TextToSpeechAudio {
|
|||||||
for (const group of m[1].split('&')) {
|
for (const group of m[1].split('&')) {
|
||||||
const sep = group.indexOf('=');
|
const sep = group.indexOf('=');
|
||||||
if (sep < 0) { continue; }
|
if (sep < 0) { continue; }
|
||||||
searchParameters[decodeURIComponent(group.substr(0, sep))] = decodeURIComponent(group.substr(sep + 1));
|
searchParameters[decodeURIComponent(group.substring(0, sep))] = decodeURIComponent(group.substring(sep + 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!searchParameters.text) { return null; }
|
if (!searchParameters.text) { return null; }
|
||||||
|
Loading…
Reference in New Issue
Block a user