alex/yomichan
1
Fork 0
Code Releases Activity

Remove unnecessary escapes from regex literals

Browse Source
This commit is contained in:
toasted-nutbread 2019-11-25 14:25:11 -05:00
parent 1daed12290
commit 527595f79b
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,7 @@ const audioUrlBuilders = {
'custom': async (definition, optionsContext) => { 'custom': async (definition, optionsContext) => {
const options = await apiOptionsGet(optionsContext); const options = await apiOptionsGet(optionsContext);
const customSourceUrl = options.audio.customSourceUrl; const customSourceUrl = options.audio.customSourceUrl;
return customSourceUrl.replace(/\{([^\}]*)\}/g, (m0, m1) => (hasOwn(definition, m1) ? `${definition[m1]}` : m0)); return customSourceUrl.replace(/\{([^}]*)\}/g, (m0, m1) => (hasOwn(definition, m1) ? `${definition[m1]}` : m0));
} }
}; };
@ -133,7 +133,7 @@ function audioUrlNormalize(url, baseUrl, basePath) {
// Begins with "/" // Begins with "/"
url = baseUrl + url; url = baseUrl + url;
} }
} else if (!/^[a-z][a-z0-9\+\-\.]*:/i.test(url)) { } else if (!/^[a-z][a-z0-9\-+.]*:/i.test(url)) {
// No URI scheme => relative path // No URI scheme => relative path
url = baseUrl + basePath + url; url = baseUrl + basePath + url;
} }

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

@ -322,7 +322,7 @@ async function dictFieldFormat(field, definition, mode, options, exceptions) {
compactGlossaries: options.general.compactGlossaries compactGlossaries: options.general.compactGlossaries
}; };
const markers = dictFieldFormat.markers; const markers = dictFieldFormat.markers;
const pattern = /\{([\w\-]+)\}/g; const pattern = /\{([\w-]+)\}/g;
return await stringReplaceAsync(field, pattern, async (g0, marker) => { return await stringReplaceAsync(field, pattern, async (g0, marker) => {
if (!markers.has(marker)) { if (!markers.has(marker)) {
return g0; return g0;

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

@ -207,7 +207,7 @@ class DisplaySearch extends Display {
async onSearchQueryUpdated(query, animate) { async onSearchQueryUpdated(query, animate) {
try { try {
const details = {}; const details = {};
const match = /[\*\uff0a]+$/.exec(query); const match = /[*\uff0a]+$/.exec(query);
if (match !== null) { if (match !== null) {
details.wildcard = true; details.wildcard = true;
query = query.substring(0, query.length - match[0].length); query = query.substring(0, query.length - match[0].length);
@ -356,7 +356,7 @@ class DisplaySearch extends Display {
} }
static getSearchQueryFromLocation(url) { static getSearchQueryFromLocation(url) {
let match = /^[^\?#]*\?(?:[^&#]*&)?query=([^&#]*)/.exec(url); let match = /^[^?#]*\?(?:[^&#]*&)?query=([^&#]*)/.exec(url);
return match !== null ? decodeURIComponent(match[1]) : null; return match !== null ? decodeURIComponent(match[1]) : null;
} }
} }

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

@ -17,7 +17,7 @@
*/ */
const REGEX_TRANSPARENT_COLOR = /rgba\s*\([^\)]*,\s*0(?:\.0+)?\s*\)/; const REGEX_TRANSPARENT_COLOR = /rgba\s*\([^)]*,\s*0(?:\.0+)?\s*\)/;
function docSetImposterStyle(style, propertyName, value) { function docSetImposterStyle(style, propertyName, value) {
style.setProperty(propertyName, value, 'important'); style.setProperty(propertyName, value, 'important');

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

@ -303,7 +303,7 @@ class Popup {
} }
static getColorInfo(cssColor) { static getColorInfo(cssColor) {
const m = /^\s*rgba?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*(?:,\s*([\d\.]+)\s*)?\)\s*$/.exec(cssColor); const m = /^\s*rgba?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*(?:,\s*([\d.]+)\s*)?\)\s*$/.exec(cssColor);
if (m === null) { return null; } if (m === null) { return null; }
const m4 = m[4]; const m4 = m[4];

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

@ -68,7 +68,7 @@ class TextToSpeechAudio {
} }
static createFromUri(ttsUri) { static createFromUri(ttsUri) {
const m = /^tts:[^#\?]*\?([^#]*)/.exec(ttsUri); const m = /^tts:[^#?]*\?([^#]*)/.exec(ttsUri);
if (m === null) { return null; } if (m === null) { return null; }
const searchParameters = {}; const searchParameters = {};