This class handles a variety of loggers, e.g. a browser console one (mostly for debugging), diff --git a/src/core/MinimalStim.js b/src/core/MinimalStim.js index 60c4bd3..b459cc9 100644 --- a/src/core/MinimalStim.js +++ b/src/core/MinimalStim.js @@ -8,9 +8,9 @@ */ -import {PsychObject} from '../util/PsychObject'; -import {PsychoJS} from './PsychoJS'; -import * as util from '../util/Util'; +import {PsychObject} from '../util/PsychObject.js'; +import {PsychoJS} from './PsychoJS.js'; +import * as util from '../util/Util.js'; diff --git a/src/core/Mouse.js b/src/core/Mouse.js index 39f28ed..6effb21 100644 --- a/src/core/Mouse.js +++ b/src/core/Mouse.js @@ -8,9 +8,9 @@ * @license Distributed under the terms of the MIT License */ -import {PsychoJS} from './PsychoJS'; -import {PsychObject} from '../util/PsychObject'; -import * as util from '../util/Util'; +import {PsychoJS} from './PsychoJS.js'; +import {PsychObject} from '../util/PsychObject.js'; +import * as util from '../util/Util.js'; /** diff --git a/src/core/PsychoJS.js b/src/core/PsychoJS.js index 3b6882b..dc60025 100644 --- a/src/core/PsychoJS.js +++ b/src/core/PsychoJS.js @@ -9,15 +9,15 @@ */ import log4javascript from 'log4javascript'; -import {Scheduler} from '../util/Scheduler'; -import {ServerManager} from './ServerManager'; -import {ExperimentHandler} from '../data/ExperimentHandler'; -import {EventManager} from './EventManager'; -import {Window} from './Window'; -import {GUI} from './GUI'; -import {MonotonicClock} from '../util/Clock'; -import {Logger} from './Logger'; -import * as util from '../util/Util'; +import {Scheduler} from '../util/Scheduler.js'; +import {ServerManager} from './ServerManager.js'; +import {ExperimentHandler} from '../data/ExperimentHandler.js'; +import {EventManager} from './EventManager.js'; +import {Window} from './Window.js'; +import {GUI} from './GUI.js'; +import {MonotonicClock} from '../util/Clock.js'; +import {Logger} from './Logger.js'; +import * as util from '../util/Util.js'; // import {Shelf} from "../data/Shelf"; diff --git a/src/core/ServerManager.js b/src/core/ServerManager.js index 5f8bf1f..2142a34 100644 --- a/src/core/ServerManager.js +++ b/src/core/ServerManager.js @@ -8,11 +8,11 @@ */ import { Howl } from 'howler'; -import {PsychoJS} from './PsychoJS'; -import {PsychObject} from '../util/PsychObject'; -import * as util from '../util/Util'; -import {ExperimentHandler} from "../data/ExperimentHandler"; -import {MonotonicClock, Clock} from "../util/Clock"; +import {PsychoJS} from './PsychoJS.js'; +import {PsychObject} from '../util/PsychObject.js'; +import * as util from '../util/Util.js'; +import {ExperimentHandler} from "../data/ExperimentHandler.js"; +import {MonotonicClock, Clock} from "../util/Clock.js"; /** diff --git a/src/core/Window.js b/src/core/Window.js index 829d031..8926e68 100644 --- a/src/core/Window.js +++ b/src/core/Window.js @@ -8,10 +8,10 @@ */ import * as PIXI from 'pixi.js-legacy'; -import {Color} from '../util/Color'; -import {PsychObject} from '../util/PsychObject'; -import {MonotonicClock} from '../util/Clock'; -import {Logger} from "./Logger"; +import {Color} from '../util/Color.js'; +import {PsychObject} from '../util/PsychObject.js'; +import {MonotonicClock} from '../util/Clock.js'; +import {Logger} from "./Logger.js"; /** *
Window displays the various stimuli of the experiment.
diff --git a/src/data/ExperimentHandler.js b/src/data/ExperimentHandler.js index 50a2d60..bc50cd8 100644 --- a/src/data/ExperimentHandler.js +++ b/src/data/ExperimentHandler.js @@ -9,9 +9,9 @@ import * as XLSX from 'xlsx'; -import {PsychObject} from '../util/PsychObject'; -import {MonotonicClock} from '../util/Clock'; -import * as util from '../util/Util'; +import {PsychObject} from '../util/PsychObject.js'; +import {MonotonicClock} from '../util/Clock.js'; +import * as util from '../util/Util.js'; /** diff --git a/src/data/TrialHandler.js b/src/data/TrialHandler.js index 47b75a4..e2fc982 100644 --- a/src/data/TrialHandler.js +++ b/src/data/TrialHandler.js @@ -12,8 +12,8 @@ import seedrandom from 'seedrandom'; import * as XLSX from 'xlsx'; -import {PsychObject} from '../util/PsychObject'; -import * as util from '../util/Util'; +import {PsychObject} from '../util/PsychObject.js'; +import * as util from '../util/Util.js'; /** *A Trial Handler handles the importing and sequencing of conditions.
diff --git a/src/sound/AudioClip.js b/src/sound/AudioClip.js index 1c358eb..72c07db 100644 --- a/src/sound/AudioClip.js +++ b/src/sound/AudioClip.js @@ -7,10 +7,10 @@ * @license Distributed under the terms of the MIT License */ -import {PsychObject} from '../util/PsychObject'; -import {PsychoJS} from '../core/PsychoJS'; -import {ExperimentHandler} from '../data/ExperimentHandler'; -import * as util from '../util/Util'; +import {PsychObject} from '../util/PsychObject.js'; +import {PsychoJS} from '../core/PsychoJS.js'; +import {ExperimentHandler} from '../data/ExperimentHandler.js'; +import * as util from '../util/Util.js'; /** diff --git a/src/sound/AudioClipPlayer.js b/src/sound/AudioClipPlayer.js index eb53947..6e819be 100644 --- a/src/sound/AudioClipPlayer.js +++ b/src/sound/AudioClipPlayer.js @@ -7,8 +7,8 @@ * @license Distributed under the terms of the MIT License */ -import {SoundPlayer} from './SoundPlayer'; -import {AudioClip} from "./AudioClip"; +import {SoundPlayer} from './SoundPlayer.js'; +import {AudioClip} from "./AudioClip.js"; /** diff --git a/src/sound/Microphone.js b/src/sound/Microphone.js index e594153..a4dbc17 100644 --- a/src/sound/Microphone.js +++ b/src/sound/Microphone.js @@ -7,12 +7,12 @@ * @license Distributed under the terms of the MIT License */ -import {Clock} from "../util/Clock"; -import {PsychObject} from "../util/PsychObject"; -import {PsychoJS} from "../core/PsychoJS"; -import * as util from '../util/Util'; -import {ExperimentHandler} from "../data/ExperimentHandler"; -import {AudioClip} from "./AudioClip"; +import {Clock} from "../util/Clock.js"; +import {PsychObject} from "../util/PsychObject.js"; +import {PsychoJS} from "../core/PsychoJS.js"; +import * as util from '../util/Util.js'; +import {ExperimentHandler} from "../data/ExperimentHandler.js"; +import {AudioClip} from "./AudioClip.js"; /** *This manager handles the recording of audio signal.
diff --git a/src/sound/Sound.js b/src/sound/Sound.js index 068cf6c..6d9e0c1 100644 --- a/src/sound/Sound.js +++ b/src/sound/Sound.js @@ -8,11 +8,11 @@ * @license Distributed under the terms of the MIT License */ -import {PsychoJS} from '../core/PsychoJS'; -import {PsychObject} from '../util/PsychObject'; -import {TonePlayer} from './TonePlayer'; -import {TrackPlayer} from './TrackPlayer'; -import {AudioClipPlayer} from './AudioClipPlayer'; +import {PsychoJS} from '../core/PsychoJS.js'; +import {PsychObject} from '../util/PsychObject.js'; +import {TonePlayer} from './TonePlayer.js'; +import {TrackPlayer} from './TrackPlayer.js'; +import {AudioClipPlayer} from './AudioClipPlayer.js'; /** diff --git a/src/sound/SoundPlayer.js b/src/sound/SoundPlayer.js index 8d088a5..9b55d0e 100644 --- a/src/sound/SoundPlayer.js +++ b/src/sound/SoundPlayer.js @@ -7,7 +7,7 @@ * @license Distributed under the terms of the MIT License */ -import {PsychObject} from '../util/PsychObject'; +import {PsychObject} from '../util/PsychObject.js'; /** diff --git a/src/sound/TonePlayer.js b/src/sound/TonePlayer.js index dfacd9a..a7a064e 100644 --- a/src/sound/TonePlayer.js +++ b/src/sound/TonePlayer.js @@ -9,7 +9,7 @@ import * as Tone from 'tone'; import { isNumeric } from "../util/Util.js"; -import {SoundPlayer} from './SoundPlayer'; +import {SoundPlayer} from './SoundPlayer.js'; /** diff --git a/src/sound/TrackPlayer.js b/src/sound/TrackPlayer.js index 058d481..a481a66 100644 --- a/src/sound/TrackPlayer.js +++ b/src/sound/TrackPlayer.js @@ -7,7 +7,7 @@ * @license Distributed under the terms of the MIT License */ -import {SoundPlayer} from './SoundPlayer'; +import {SoundPlayer} from './SoundPlayer.js'; /** diff --git a/src/util/ColorMixin.js b/src/util/ColorMixin.js index 59a31ca..2379bae 100644 --- a/src/util/ColorMixin.js +++ b/src/util/ColorMixin.js @@ -8,7 +8,7 @@ */ -import {Color} from './Color'; +import {Color} from './Color.js'; /** diff --git a/src/util/EventEmitter.js b/src/util/EventEmitter.js index 5f4ad88..3f5814a 100644 --- a/src/util/EventEmitter.js +++ b/src/util/EventEmitter.js @@ -8,7 +8,7 @@ */ -import * as util from './Util'; +import * as util from './Util.js'; /** diff --git a/src/util/PsychObject.js b/src/util/PsychObject.js index 381a6f9..fe955bd 100644 --- a/src/util/PsychObject.js +++ b/src/util/PsychObject.js @@ -9,8 +9,8 @@ */ -import {EventEmitter} from './EventEmitter'; -import * as util from './Util'; +import {EventEmitter} from './EventEmitter.js'; +import * as util from './Util.js'; /** diff --git a/src/visual/Form.js b/src/visual/Form.js index c931c0a..a526ffd 100644 --- a/src/visual/Form.js +++ b/src/visual/Form.js @@ -9,14 +9,14 @@ import * as PIXI from 'pixi.js-legacy'; -import {Color} from '../util/Color'; -import {ColorMixin} from '../util/ColorMixin'; -import * as util from '../util/Util'; -import {TrialHandler} from '../data/TrialHandler'; -import {TextStim} from './TextStim'; -import {TextBox} from './TextBox'; -import {VisualStim} from './VisualStim'; -import {Slider} from './Slider'; +import {Color} from '../util/Color.js'; +import {ColorMixin} from '../util/ColorMixin.js'; +import * as util from '../util/Util.js'; +import {TrialHandler} from '../data/TrialHandler.js'; +import {TextStim} from './TextStim.js'; +import {TextBox} from './TextBox.js'; +import {VisualStim} from './VisualStim.js'; +import {Slider} from './Slider.js'; import { to_pixiPoint } from "../util/Pixi.js"; diff --git a/src/visual/ImageStim.js b/src/visual/ImageStim.js index 62273bd..39479a8 100644 --- a/src/visual/ImageStim.js +++ b/src/visual/ImageStim.js @@ -9,10 +9,10 @@ import * as PIXI from 'pixi.js-legacy'; -import {VisualStim} from './VisualStim'; -import {Color} from '../util/Color'; -import {ColorMixin} from '../util/ColorMixin'; -import * as util from '../util/Util'; +import {VisualStim} from './VisualStim.js'; +import {Color} from '../util/Color.js'; +import {ColorMixin} from '../util/ColorMixin.js'; +import * as util from '../util/Util.js'; import { to_pixiPoint } from "../util/Pixi.js"; diff --git a/src/visual/MovieStim.js b/src/visual/MovieStim.js index 3dec9a9..475b05f 100644 --- a/src/visual/MovieStim.js +++ b/src/visual/MovieStim.js @@ -9,11 +9,11 @@ import * as PIXI from 'pixi.js-legacy'; -import {VisualStim} from './VisualStim'; -import {Color} from '../util/Color'; -import {ColorMixin} from '../util/ColorMixin'; -import * as util from '../util/Util'; -import {PsychoJS} from "../core/PsychoJS"; +import {VisualStim} from './VisualStim.js'; +import {Color} from '../util/Color.js'; +import {ColorMixin} from '../util/ColorMixin.js'; +import * as util from '../util/Util.js'; +import {PsychoJS} from "../core/PsychoJS.js"; import { to_pixiPoint } from "../util/Pixi.js"; diff --git a/src/visual/Polygon.js b/src/visual/Polygon.js index d861ffa..1f74e8d 100644 --- a/src/visual/Polygon.js +++ b/src/visual/Polygon.js @@ -8,8 +8,8 @@ */ -import {ShapeStim} from './ShapeStim'; -import {Color} from '../util/Color'; +import {ShapeStim} from './ShapeStim.js'; +import {Color} from '../util/Color.js'; /** diff --git a/src/visual/Rect.js b/src/visual/Rect.js index 063897f..43740bf 100644 --- a/src/visual/Rect.js +++ b/src/visual/Rect.js @@ -8,8 +8,8 @@ */ -import {ShapeStim} from './ShapeStim'; -import {Color} from '../util/Color'; +import {ShapeStim} from './ShapeStim.js'; +import {Color} from '../util/Color.js'; /** diff --git a/src/visual/ShapeStim.js b/src/visual/ShapeStim.js index 613dbd0..8aeab4b 100644 --- a/src/visual/ShapeStim.js +++ b/src/visual/ShapeStim.js @@ -10,12 +10,12 @@ import * as PIXI from 'pixi.js-legacy'; -import {VisualStim} from './VisualStim'; -import {Color} from '../util/Color'; -import {ColorMixin} from '../util/ColorMixin'; -import * as util from '../util/Util'; +import {VisualStim} from './VisualStim.js'; +import {Color} from '../util/Color.js'; +import {ColorMixin} from '../util/ColorMixin.js'; +import * as util from '../util/Util.js'; import { to_pixiPoint } from "../util/Pixi.js"; -import {WindowMixin} from "../core/WindowMixin"; +import {WindowMixin} from "../core/WindowMixin.js"; /** diff --git a/src/visual/Slider.js b/src/visual/Slider.js index ab1af75..aab8448 100644 --- a/src/visual/Slider.js +++ b/src/visual/Slider.js @@ -9,13 +9,13 @@ import * as PIXI from 'pixi.js-legacy'; -import {VisualStim} from './VisualStim'; -import {Color} from '../util/Color'; -import {ColorMixin} from '../util/ColorMixin'; -import {WindowMixin} from '../core/WindowMixin'; -import {Clock} from '../util/Clock'; -import * as util from '../util/Util'; -import {PsychoJS} from "../core/PsychoJS"; +import {VisualStim} from './VisualStim.js'; +import {Color} from '../util/Color.js'; +import {ColorMixin} from '../util/ColorMixin.js'; +import {WindowMixin} from '../core/WindowMixin.js'; +import {Clock} from '../util/Clock.js'; +import * as util from '../util/Util.js'; +import {PsychoJS} from "../core/PsychoJS.js"; import { to_pixiPoint } from "../util/Pixi.js"; diff --git a/src/visual/TextBox.js b/src/visual/TextBox.js index 01b2b7e..313f5d9 100644 --- a/src/visual/TextBox.js +++ b/src/visual/TextBox.js @@ -9,12 +9,12 @@ import * as PIXI from 'pixi.js-legacy'; -import {VisualStim} from './VisualStim'; -import {Color} from '../util/Color'; -import {ColorMixin} from '../util/ColorMixin'; -import {TextInput} from './TextInput'; +import {VisualStim} from './VisualStim.js'; +import {Color} from '../util/Color.js'; +import {ColorMixin} from '../util/ColorMixin.js'; +import {TextInput} from './TextInput.js'; import {ButtonStim} from './ButtonStim.js'; -import * as util from '../util/Util'; +import * as util from '../util/Util.js'; // TODO finish documenting all options /** diff --git a/src/visual/TextStim.js b/src/visual/TextStim.js index f02c980..c214377 100644 --- a/src/visual/TextStim.js +++ b/src/visual/TextStim.js @@ -9,10 +9,10 @@ import * as PIXI from 'pixi.js-legacy'; -import {VisualStim} from './VisualStim'; -import {Color} from '../util/Color'; -import {ColorMixin} from '../util/ColorMixin'; -import * as util from '../util/Util'; +import {VisualStim} from './VisualStim.js'; +import {Color} from '../util/Color.js'; +import {ColorMixin} from '../util/ColorMixin.js'; +import * as util from '../util/Util.js'; import { to_pixiPoint } from "../util/Pixi.js"; diff --git a/src/visual/VisualStim.js b/src/visual/VisualStim.js index 4f1b815..7c6919b 100644 --- a/src/visual/VisualStim.js +++ b/src/visual/VisualStim.js @@ -9,9 +9,9 @@ import * as PIXI from 'pixi.js-legacy'; -import {MinimalStim} from '../core/MinimalStim'; -import {WindowMixin} from '../core/WindowMixin'; -import * as util from '../util/Util'; +import {MinimalStim} from '../core/MinimalStim.js'; +import {WindowMixin} from '../core/WindowMixin.js'; +import * as util from '../util/Util.js'; /**