summaryrefslogtreecommitdiff
path: root/ext/js
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2021-02-14 11:32:30 -0500
committerGitHub <noreply@github.com>2021-02-14 11:32:30 -0500
commit5268c5d1bc079ac99e99cf04853d3dea22def403 (patch)
tree0ea2383369fe571bd0686e69a626db1464c92a8a /ext/js
parent0117df6bd8b1603fec0eb5b8d840e777372f47c8 (diff)
Util rename (#1389)
* Rename MediaUtility to MediaUtil for consistency * Update variable names * Rename media-utility.js to media-util.js * Rename ProfileConditions to ProfileConditionsUtil * Rename variables * Move profile-conditions.js to profile-conditions-util.js * Rename test-profile-conditions.js to test-profile-conditions-util.js
Diffstat (limited to 'ext/js')
-rw-r--r--ext/js/background/backend.js16
-rw-r--r--ext/js/background/profile-conditions-util.js (renamed from ext/js/background/profile-conditions.js)2
-rw-r--r--ext/js/comm/clipboard-reader.js8
-rw-r--r--ext/js/language/dictionary-importer.js6
-rw-r--r--ext/js/media/media-util.js (renamed from ext/js/media/media-utility.js)4
5 files changed, 18 insertions, 18 deletions
diff --git a/ext/js/background/backend.js b/ext/js/background/backend.js
index 3bb23310..69c90aca 100644
--- a/ext/js/background/backend.js
+++ b/ext/js/background/backend.js
@@ -25,11 +25,11 @@
* JapaneseUtil
* JsonSchemaValidator
* Mecab
- * MediaUtility
+ * MediaUtil
* ObjectPropertyAccessor
* OptionsUtil
* PermissionsUtil
- * ProfileConditions
+ * ProfileConditionsUtil
* RequestBuilder
* Translator
* wanakana
@@ -46,13 +46,13 @@ class Backend {
});
this._anki = new AnkiConnect();
this._mecab = new Mecab();
- this._mediaUtility = new MediaUtility();
+ this._mediaUtil = new MediaUtil();
this._clipboardReader = new ClipboardReader({
// eslint-disable-next-line no-undef
document: (typeof document === 'object' && document !== null ? document : null),
pasteTargetSelector: '#clipboard-paste-target',
imagePasteTargetSelector: '#clipboard-image-paste-target',
- mediaUtility: this._mediaUtility
+ mediaUtil: this._mediaUtil
});
this._clipboardMonitor = new ClipboardMonitor({
japaneseUtil: this._japaneseUtil,
@@ -61,7 +61,7 @@ class Backend {
this._options = null;
this._profileConditionsSchemaValidator = new JsonSchemaValidator();
this._profileConditionsSchemaCache = [];
- this._profileConditionsUtil = new ProfileConditions();
+ this._profileConditionsUtil = new ProfileConditionsUtil();
this._defaultAnkiFieldTemplates = null;
this._requestBuilder = new RequestBuilder();
this._audioDownloader = new AudioDownloader({
@@ -1707,7 +1707,7 @@ class Backend {
return null;
}
- let extension = this._mediaUtility.getFileExtensionFromAudioMediaType(contentType);
+ let extension = this._mediaUtil.getFileExtensionFromAudioMediaType(contentType);
if (extension === null) { extension = '.mp3'; }
let fileName = this._generateAnkiNoteMediaFileName('yomichan_audio', extension, timestamp, definitionDetails);
fileName = fileName.replace(/\]/g, '');
@@ -1721,7 +1721,7 @@ class Backend {
const dataUrl = await this._getScreenshot(tabId, frameId, format, quality);
const {mediaType, data} = this._getDataUrlInfo(dataUrl);
- const extension = this._mediaUtility.getFileExtensionFromImageMediaType(mediaType);
+ const extension = this._mediaUtil.getFileExtensionFromImageMediaType(mediaType);
if (extension === null) {
throw new Error('Unknown media type for screenshot image');
}
@@ -1739,7 +1739,7 @@ class Backend {
}
const {mediaType, data} = this._getDataUrlInfo(dataUrl);
- const extension = this._mediaUtility.getFileExtensionFromImageMediaType(mediaType);
+ const extension = this._mediaUtil.getFileExtensionFromImageMediaType(mediaType);
if (extension === null) {
throw new Error('Unknown media type for clipboard image');
}
diff --git a/ext/js/background/profile-conditions.js b/ext/js/background/profile-conditions-util.js
index 8e6c7163..928026e0 100644
--- a/ext/js/background/profile-conditions.js
+++ b/ext/js/background/profile-conditions-util.js
@@ -18,7 +18,7 @@
/**
* Utility class to help processing profile conditions.
*/
-class ProfileConditions {
+class ProfileConditionsUtil {
/**
* Creates a new instance.
*/
diff --git a/ext/js/comm/clipboard-reader.js b/ext/js/comm/clipboard-reader.js
index 275c2d60..6d4f5abc 100644
--- a/ext/js/comm/clipboard-reader.js
+++ b/ext/js/comm/clipboard-reader.js
@@ -25,14 +25,14 @@ class ClipboardReader {
* @param pasteTargetSelector The selector for the paste target element.
* @param imagePasteTargetSelector The selector for the image paste target element.
*/
- constructor({document=null, pasteTargetSelector=null, imagePasteTargetSelector=null, mediaUtility=null}) {
+ constructor({document=null, pasteTargetSelector=null, imagePasteTargetSelector=null, mediaUtil=null}) {
this._document = document;
this._browser = null;
this._pasteTarget = null;
this._pasteTargetSelector = pasteTargetSelector;
this._imagePasteTarget = null;
this._imagePasteTargetSelector = imagePasteTargetSelector;
- this._mediaUtility = mediaUtility;
+ this._mediaUtil = mediaUtil;
}
/**
@@ -107,7 +107,7 @@ class ClipboardReader {
// See browser-specific notes in getText
if (
this._isFirefox() &&
- this._mediaUtility !== null &&
+ this._mediaUtil !== null &&
typeof navigator.clipboard !== 'undefined' &&
typeof navigator.clipboard.read === 'function'
) {
@@ -120,7 +120,7 @@ class ClipboardReader {
}
for (const file of files) {
- if (this._mediaUtility.getFileExtensionFromImageMediaType(file.type) !== null) {
+ if (this._mediaUtil.getFileExtensionFromImageMediaType(file.type) !== null) {
return await this._readFileAsDataURL(file);
}
}
diff --git a/ext/js/language/dictionary-importer.js b/ext/js/language/dictionary-importer.js
index 4cb608db..c23a93e3 100644
--- a/ext/js/language/dictionary-importer.js
+++ b/ext/js/language/dictionary-importer.js
@@ -18,14 +18,14 @@
/* global
* JSZip
* JsonSchemaValidator
- * MediaUtility
+ * MediaUtil
*/
class DictionaryImporter {
constructor() {
this._schemas = new Map();
this._jsonSchemaValidator = new JsonSchemaValidator();
- this._mediaUtility = new MediaUtility();
+ this._mediaUtil = new MediaUtil();
}
async importDictionary(dictionaryDatabase, archiveSource, details, onProgress) {
@@ -325,7 +325,7 @@ class DictionaryImporter {
}
const content = await file.async('base64');
- const mediaType = this._mediaUtility.getImageMediaTypeFromFileName(path);
+ const mediaType = this._mediaUtil.getImageMediaTypeFromFileName(path);
if (mediaType === null) {
throw new Error(`Could not determine media type for image at path ${JSON.stringify(path)} for ${errorSource}`);
}
diff --git a/ext/js/media/media-utility.js b/ext/js/media/media-util.js
index b4fbe04d..25bcdd18 100644
--- a/ext/js/media/media-utility.js
+++ b/ext/js/media/media-util.js
@@ -16,9 +16,9 @@
*/
/**
- * MediaUtility is a class containing helper methods related to media processing.
+ * MediaUtil is a class containing helper methods related to media processing.
*/
-class MediaUtility {
+class MediaUtil {
/**
* Gets the file extension of a file path. URL search queries and hash
* fragments are not handled.