alex/yomichan
1
Fork 0
Code Releases Activity

Replace string.substr and string.slice with string.substring

Browse Source 
Improves semantic clarity, and it's recommended to not use substr.
This commit is contained in:
toasted-nutbread 2019-11-24 11:02:52 -05:00
parent eef05f6a64
commit cf18e3b42e
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/bg/js/audio.js
View File

@ -128,7 +128,7 @@ function audioUrlNormalize(url, baseUrl, basePath) {
if (url[0] === '/') {
if (url.length >= 2 && url[1] === '/') {
// Begins with "//"
url = baseUrl.substr(0, baseUrl.indexOf(':') + 1) + url;
url = baseUrl.substring(0, baseUrl.indexOf(':') + 1) + url;
} else {
// Begins with "/"
url = baseUrl + url;

2
ext/bg/js/deinflector.js
View File

@ -44,7 +44,7 @@ class Deinflector {
results.push({
source,
term: term.slice(0, -kanaIn.length) + kanaOut,
term: term.substring(0, term.length - kanaIn.length) + kanaOut,
rules: rulesOut,
definitions: [],
reasons: [reason, ...reasons]

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

@ -207,7 +207,7 @@ class DisplaySearch extends Display {
const match = /[\*\uff0a]+$/.exec(query);
if (match !== null) {
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);

20
ext/bg/js/translator.js
View File

@ -327,22 +327,22 @@ class Translator {
const deinflections = [];
for (let i = text.length; i > 0; --i) {
const textSlice = text.slice(0, i);
deinflections.push(...this.deinflector.deinflect(textSlice));
const textSubstring = text.substring(0, i);
deinflections.push(...this.deinflector.deinflect(textSubstring));
}
return deinflections;
}
getDeinflections2(text, text2) {
getDeinflections2(text1, text2) {
const deinflections = [];
for (let i = text.length; i > 0; --i) {
const textSlice = text.slice(0, i);
const text2Slice = text2.slice(0, i);
deinflections.push(...this.deinflector.deinflect(textSlice));
if (textSlice !== text2Slice) {
deinflections.push(...this.deinflector.deinflect(text2Slice));
for (let i = text1.length; i > 0; --i) {
const text1Substring = text1.substring(0, i);
const text2Substring = text2.substring(0, i);
deinflections.push(...this.deinflector.deinflect(text1Substring));
if (text1Substring !== text2Substring) {
deinflections.push(...this.deinflector.deinflect(text2Substring));
}
}
@ -516,6 +516,6 @@ class Translator {
static getNameBase(name) {
const pos = name.indexOf(':');
return (pos >= 0 ? name.substr(0, pos) : name);
return (pos >= 0 ? name.substring(0, pos) : name);
}
}

2
ext/fg/js/popup.js
View File

@ -391,7 +391,7 @@ class Popup {
static isOnExtensionPage() {
try {
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) {
// NOP
}

2
ext/mixed/js/audio.js
View File

@ -75,7 +75,7 @@ class TextToSpeechAudio {
for (const group of m[1].split('&')) {
const sep = group.indexOf('=');
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; }