Merge pull request #307 from themoeway/modernize

Modernize codebase

4 files changed, 11 insertions, 14 deletions

diff --git a/ext/js/media/audio-downloader.js b/ext/js/media/audio-downloader.js
index 32048553..1720a5d9 100644
--- a/ext/js/media/audio-downloader.js
+++ b/ext/js/media/audio-downloader.js
@@ -16,15 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* global
- * ArrayBufferUtil
- * JsonSchema
- * NativeSimpleDOMParser
- * RequestBuilder
- * SimpleDOMParser
- */
+import {RequestBuilder} from '../background/request-builder.js';
+import {JsonSchema} from '../data/json-schema.js';
+import {ArrayBufferUtil} from '../data/sandbox/array-buffer-util.js';
+import {NativeSimpleDOMParser} from '../dom/native-simple-dom-parser.js';
+import {SimpleDOMParser} from '../dom/simple-dom-parser.js';
 
-class AudioDownloader {
+export class AudioDownloader {
     constructor({japaneseUtil, requestBuilder}) {
         this._japaneseUtil = japaneseUtil;
         this._requestBuilder = requestBuilder;
diff --git a/ext/js/media/audio-system.js b/ext/js/media/audio-system.js
index d8b78fdc..55812bec 100644
--- a/ext/js/media/audio-system.js
+++ b/ext/js/media/audio-system.js
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* global
- * TextToSpeechAudio
- */
+import {EventDispatcher} from '../core.js';
+import {TextToSpeechAudio} from './text-to-speech-audio.js';
 
-class AudioSystem extends EventDispatcher {
+export class AudioSystem extends EventDispatcher {
     constructor() {
         super();
         this._fallbackAudio = null;
diff --git a/ext/js/media/media-util.js b/ext/js/media/media-util.js
index eb7f95f8..843dc11c 100644
--- a/ext/js/media/media-util.js
+++ b/ext/js/media/media-util.js
@@ -19,7 +19,7 @@
 /**
  * MediaUtil is a class containing helper methods related to media processing.
  */
-class MediaUtil {
+export class MediaUtil {
     /**
      * Gets the file extension of a file path. URL search queries and hash
      * fragments are not handled.
diff --git a/ext/js/media/text-to-speech-audio.js b/ext/js/media/text-to-speech-audio.js
index 35a0b9b1..ae717519 100644
--- a/ext/js/media/text-to-speech-audio.js
+++ b/ext/js/media/text-to-speech-audio.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-class TextToSpeechAudio {
+export class TextToSpeechAudio {
     constructor(text, voice) {
         this._text = text;
         this._voice = voice;