HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 10:40:54 +00:00
Code Actions Packages Releases Activity

Merge pull request #431 from thewhodidthis/main

Browse Source 
Fix import paths
This commit is contained in:
Sotiri Bakagiannis 2021-07-09 13:51:30 +01:00 committed by GitHub
commit 6c92771864
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/EventManager.js
View File

@ -7,8 +7,8 @@
* @license Distributed under the terms of the MIT License * @license Distributed under the terms of the MIT License
*/ */
import {MonotonicClock, Clock} from '../util/Clock'; import {MonotonicClock, Clock} from '../util/Clock.js';
import {PsychoJS} from './PsychoJS'; import {PsychoJS} from './PsychoJS.js';
/** /**

12
src/core/GUI.js
View File

@ -9,12 +9,12 @@
*/ */
import * as Tone from 'tone'; import * as Tone from 'tone';
import {PsychoJS} from './PsychoJS'; import {PsychoJS} from './PsychoJS.js';
import {ServerManager} from './ServerManager'; import {ServerManager} from './ServerManager.js';
import {Scheduler} from '../util/Scheduler'; import {Scheduler} from '../util/Scheduler.js';
import {Clock} from '../util/Clock'; import {Clock} from '../util/Clock.js';
import {ExperimentHandler} from '../data/ExperimentHandler'; import {ExperimentHandler} from '../data/ExperimentHandler.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
/** /**

8
src/core/Keyboard.js
View File

@ -7,10 +7,10 @@
* @license Distributed under the terms of the MIT License * @license Distributed under the terms of the MIT License
*/ */
import {Clock, MonotonicClock} from "../util/Clock"; import {Clock, MonotonicClock} from "../util/Clock.js";
import {PsychObject} from "../util/PsychObject"; import {PsychObject} from "../util/PsychObject.js";
import {PsychoJS} from "./PsychoJS"; import {PsychoJS} from "./PsychoJS.js";
import {EventManager} from "./EventManager"; import {EventManager} from "./EventManager.js";
/** /**

6
src/core/Logger.js
View File

@ -10,9 +10,9 @@
import log4javascript from 'log4javascript'; import log4javascript from 'log4javascript';
import pako from 'pako'; import pako from 'pako';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
import {MonotonicClock} from '../util/Clock'; import {MonotonicClock} from '../util/Clock.js';
import {ExperimentHandler} from '../data/ExperimentHandler'; import {ExperimentHandler} from '../data/ExperimentHandler.js';
/** /**
* <p>This class handles a variety of loggers, e.g. a browser console one (mostly for debugging), * <p>This class handles a variety of loggers, e.g. a browser console one (mostly for debugging),

6
src/core/MinimalStim.js
View File

@ -8,9 +8,9 @@
*/ */
import {PsychObject} from '../util/PsychObject'; import {PsychObject} from '../util/PsychObject.js';
import {PsychoJS} from './PsychoJS'; import {PsychoJS} from './PsychoJS.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';

6
src/core/Mouse.js
View File

@ -8,9 +8,9 @@
* @license Distributed under the terms of the MIT License * @license Distributed under the terms of the MIT License
*/ */
import {PsychoJS} from './PsychoJS'; import {PsychoJS} from './PsychoJS.js';
import {PsychObject} from '../util/PsychObject'; import {PsychObject} from '../util/PsychObject.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
/** /**

18
src/core/PsychoJS.js
View File

@ -9,15 +9,15 @@
*/ */
import log4javascript from 'log4javascript'; import log4javascript from 'log4javascript';
import {Scheduler} from '../util/Scheduler'; import {Scheduler} from '../util/Scheduler.js';
import {ServerManager} from './ServerManager'; import {ServerManager} from './ServerManager.js';
import {ExperimentHandler} from '../data/ExperimentHandler'; import {ExperimentHandler} from '../data/ExperimentHandler.js';
import {EventManager} from './EventManager'; import {EventManager} from './EventManager.js';
import {Window} from './Window'; import {Window} from './Window.js';
import {GUI} from './GUI'; import {GUI} from './GUI.js';
import {MonotonicClock} from '../util/Clock'; import {MonotonicClock} from '../util/Clock.js';
import {Logger} from './Logger'; import {Logger} from './Logger.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
// import {Shelf} from "../data/Shelf"; // import {Shelf} from "../data/Shelf";

10
src/core/ServerManager.js
View File

@ -8,11 +8,11 @@
*/ */
import { Howl } from 'howler'; import { Howl } from 'howler';
import {PsychoJS} from './PsychoJS'; import {PsychoJS} from './PsychoJS.js';
import {PsychObject} from '../util/PsychObject'; import {PsychObject} from '../util/PsychObject.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
import {ExperimentHandler} from "../data/ExperimentHandler"; import {ExperimentHandler} from "../data/ExperimentHandler.js";
import {MonotonicClock, Clock} from "../util/Clock"; import {MonotonicClock, Clock} from "../util/Clock.js";
/** /**

8
src/core/Window.js
View File

@ -8,10 +8,10 @@
*/ */
import * as PIXI from 'pixi.js-legacy'; import * as PIXI from 'pixi.js-legacy';
import {Color} from '../util/Color'; import {Color} from '../util/Color.js';
import {PsychObject} from '../util/PsychObject'; import {PsychObject} from '../util/PsychObject.js';
import {MonotonicClock} from '../util/Clock'; import {MonotonicClock} from '../util/Clock.js';
import {Logger} from "./Logger"; import {Logger} from "./Logger.js";
/** /**
* <p>Window displays the various stimuli of the experiment.</p> * <p>Window displays the various stimuli of the experiment.</p>

6
src/data/ExperimentHandler.js
View File

@ -9,9 +9,9 @@
import * as XLSX from 'xlsx'; import * as XLSX from 'xlsx';
import {PsychObject} from '../util/PsychObject'; import {PsychObject} from '../util/PsychObject.js';
import {MonotonicClock} from '../util/Clock'; import {MonotonicClock} from '../util/Clock.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
/** /**

4
src/data/TrialHandler.js
View File

@ -12,8 +12,8 @@
import seedrandom from 'seedrandom'; import seedrandom from 'seedrandom';
import * as XLSX from 'xlsx'; import * as XLSX from 'xlsx';
import {PsychObject} from '../util/PsychObject'; import {PsychObject} from '../util/PsychObject.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
/** /**
* <p>A Trial Handler handles the importing and sequencing of conditions.</p> * <p>A Trial Handler handles the importing and sequencing of conditions.</p>

8
src/sound/AudioClip.js
View File

@ -7,10 +7,10 @@
* @license Distributed under the terms of the MIT License * @license Distributed under the terms of the MIT License
*/ */
import {PsychObject} from '../util/PsychObject'; import {PsychObject} from '../util/PsychObject.js';
import {PsychoJS} from '../core/PsychoJS'; import {PsychoJS} from '../core/PsychoJS.js';
import {ExperimentHandler} from '../data/ExperimentHandler'; import {ExperimentHandler} from '../data/ExperimentHandler.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
/** /**

4
src/sound/AudioClipPlayer.js
View File

@ -7,8 +7,8 @@
* @license Distributed under the terms of the MIT License * @license Distributed under the terms of the MIT License
*/ */
import {SoundPlayer} from './SoundPlayer'; import {SoundPlayer} from './SoundPlayer.js';
import {AudioClip} from "./AudioClip"; import {AudioClip} from "./AudioClip.js";
/** /**

12
src/sound/Microphone.js
View File

@ -7,12 +7,12 @@
* @license Distributed under the terms of the MIT License * @license Distributed under the terms of the MIT License
*/ */
import {Clock} from "../util/Clock"; import {Clock} from "../util/Clock.js";
import {PsychObject} from "../util/PsychObject"; import {PsychObject} from "../util/PsychObject.js";
import {PsychoJS} from "../core/PsychoJS"; import {PsychoJS} from "../core/PsychoJS.js";
import * as util from '../util/Util'; import * as util from '../util/Util.js';
import {ExperimentHandler} from "../data/ExperimentHandler"; import {ExperimentHandler} from "../data/ExperimentHandler.js";
import {AudioClip} from "./AudioClip"; import {AudioClip} from "./AudioClip.js";
/** /**
* <p>This manager handles the recording of audio signal.</p> * <p>This manager handles the recording of audio signal.</p>

10
src/sound/Sound.js
View File

@ -8,11 +8,11 @@
* @license Distributed under the terms of the MIT License * @license Distributed under the terms of the MIT License
*/ */
import {PsychoJS} from '../core/PsychoJS'; import {PsychoJS} from '../core/PsychoJS.js';
import {PsychObject} from '../util/PsychObject'; import {PsychObject} from '../util/PsychObject.js';
import {TonePlayer} from './TonePlayer'; import {TonePlayer} from './TonePlayer.js';
import {TrackPlayer} from './TrackPlayer'; import {TrackPlayer} from './TrackPlayer.js';
import {AudioClipPlayer} from './AudioClipPlayer'; import {AudioClipPlayer} from './AudioClipPlayer.js';
/** /**

2
src/sound/SoundPlayer.js
View File

@ -7,7 +7,7 @@
* @license Distributed under the terms of the MIT License * @license Distributed under the terms of the MIT License
*/ */
import {PsychObject} from '../util/PsychObject'; import {PsychObject} from '../util/PsychObject.js';
/** /**

2
src/sound/TonePlayer.js
View File

@ -9,7 +9,7 @@
import * as Tone from 'tone'; import * as Tone from 'tone';
import { isNumeric } from "../util/Util.js"; import { isNumeric } from "../util/Util.js";
import {SoundPlayer} from './SoundPlayer'; import {SoundPlayer} from './SoundPlayer.js';
/** /**

2
src/sound/TrackPlayer.js
View File

@ -7,7 +7,7 @@
* @license Distributed under the terms of the MIT License * @license Distributed under the terms of the MIT License
*/ */
import {SoundPlayer} from './SoundPlayer'; import {SoundPlayer} from './SoundPlayer.js';
/** /**

2
src/util/ColorMixin.js
View File

@ -8,7 +8,7 @@
*/ */
import {Color} from './Color'; import {Color} from './Color.js';
/** /**

2
src/util/EventEmitter.js
View File

@ -8,7 +8,7 @@
*/ */
import * as util from './Util'; import * as util from './Util.js';
/** /**

4
src/util/PsychObject.js
View File

@ -9,8 +9,8 @@
*/ */
import {EventEmitter} from './EventEmitter'; import {EventEmitter} from './EventEmitter.js';
import * as util from './Util'; import * as util from './Util.js';
/** /**

16
src/visual/Form.js
View File

@ -9,14 +9,14 @@
import * as PIXI from 'pixi.js-legacy'; import * as PIXI from 'pixi.js-legacy';
import {Color} from '../util/Color'; import {Color} from '../util/Color.js';
import {ColorMixin} from '../util/ColorMixin'; import {ColorMixin} from '../util/ColorMixin.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
import {TrialHandler} from '../data/TrialHandler'; import {TrialHandler} from '../data/TrialHandler.js';
import {TextStim} from './TextStim'; import {TextStim} from './TextStim.js';
import {TextBox} from './TextBox'; import {TextBox} from './TextBox.js';
import {VisualStim} from './VisualStim'; import {VisualStim} from './VisualStim.js';
import {Slider} from './Slider'; import {Slider} from './Slider.js';
import { to_pixiPoint } from "../util/Pixi.js"; import { to_pixiPoint } from "../util/Pixi.js";

8
src/visual/ImageStim.js
View File

@ -9,10 +9,10 @@
import * as PIXI from 'pixi.js-legacy'; import * as PIXI from 'pixi.js-legacy';
import {VisualStim} from './VisualStim'; import {VisualStim} from './VisualStim.js';
import {Color} from '../util/Color'; import {Color} from '../util/Color.js';
import {ColorMixin} from '../util/ColorMixin'; import {ColorMixin} from '../util/ColorMixin.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
import { to_pixiPoint } from "../util/Pixi.js"; import { to_pixiPoint } from "../util/Pixi.js";

10
src/visual/MovieStim.js
View File

@ -9,11 +9,11 @@
import * as PIXI from 'pixi.js-legacy'; import * as PIXI from 'pixi.js-legacy';
import {VisualStim} from './VisualStim'; import {VisualStim} from './VisualStim.js';
import {Color} from '../util/Color'; import {Color} from '../util/Color.js';
import {ColorMixin} from '../util/ColorMixin'; import {ColorMixin} from '../util/ColorMixin.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
import {PsychoJS} from "../core/PsychoJS"; import {PsychoJS} from "../core/PsychoJS.js";
import { to_pixiPoint } from "../util/Pixi.js"; import { to_pixiPoint } from "../util/Pixi.js";

4
src/visual/Polygon.js
View File

@ -8,8 +8,8 @@
*/ */
import {ShapeStim} from './ShapeStim'; import {ShapeStim} from './ShapeStim.js';
import {Color} from '../util/Color'; import {Color} from '../util/Color.js';
/** /**

4
src/visual/Rect.js
View File

@ -8,8 +8,8 @@
*/ */
import {ShapeStim} from './ShapeStim'; import {ShapeStim} from './ShapeStim.js';
import {Color} from '../util/Color'; import {Color} from '../util/Color.js';
/** /**

10
src/visual/ShapeStim.js
View File

@ -10,12 +10,12 @@
import * as PIXI from 'pixi.js-legacy'; import * as PIXI from 'pixi.js-legacy';
import {VisualStim} from './VisualStim'; import {VisualStim} from './VisualStim.js';
import {Color} from '../util/Color'; import {Color} from '../util/Color.js';
import {ColorMixin} from '../util/ColorMixin'; import {ColorMixin} from '../util/ColorMixin.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
import { to_pixiPoint } from "../util/Pixi.js"; import { to_pixiPoint } from "../util/Pixi.js";
import {WindowMixin} from "../core/WindowMixin"; import {WindowMixin} from "../core/WindowMixin.js";
/** /**

14
src/visual/Slider.js
View File

@ -9,13 +9,13 @@
import * as PIXI from 'pixi.js-legacy'; import * as PIXI from 'pixi.js-legacy';
import {VisualStim} from './VisualStim'; import {VisualStim} from './VisualStim.js';
import {Color} from '../util/Color'; import {Color} from '../util/Color.js';
import {ColorMixin} from '../util/ColorMixin'; import {ColorMixin} from '../util/ColorMixin.js';
import {WindowMixin} from '../core/WindowMixin'; import {WindowMixin} from '../core/WindowMixin.js';
import {Clock} from '../util/Clock'; import {Clock} from '../util/Clock.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
import {PsychoJS} from "../core/PsychoJS"; import {PsychoJS} from "../core/PsychoJS.js";
import { to_pixiPoint } from "../util/Pixi.js"; import { to_pixiPoint } from "../util/Pixi.js";

10
src/visual/TextBox.js
View File

@ -9,12 +9,12 @@
import * as PIXI from 'pixi.js-legacy'; import * as PIXI from 'pixi.js-legacy';
import {VisualStim} from './VisualStim'; import {VisualStim} from './VisualStim.js';
import {Color} from '../util/Color'; import {Color} from '../util/Color.js';
import {ColorMixin} from '../util/ColorMixin'; import {ColorMixin} from '../util/ColorMixin.js';
import {TextInput} from './TextInput'; import {TextInput} from './TextInput.js';
import {ButtonStim} from './ButtonStim.js'; import {ButtonStim} from './ButtonStim.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
// TODO finish documenting all options // TODO finish documenting all options
/** /**

8
src/visual/TextStim.js
View File

@ -9,10 +9,10 @@
import * as PIXI from 'pixi.js-legacy'; import * as PIXI from 'pixi.js-legacy';
import {VisualStim} from './VisualStim'; import {VisualStim} from './VisualStim.js';
import {Color} from '../util/Color'; import {Color} from '../util/Color.js';
import {ColorMixin} from '../util/ColorMixin'; import {ColorMixin} from '../util/ColorMixin.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
import { to_pixiPoint } from "../util/Pixi.js"; import { to_pixiPoint } from "../util/Pixi.js";

6
src/visual/VisualStim.js
View File

@ -9,9 +9,9 @@
import * as PIXI from 'pixi.js-legacy'; import * as PIXI from 'pixi.js-legacy';
import {MinimalStim} from '../core/MinimalStim'; import {MinimalStim} from '../core/MinimalStim.js';
import {WindowMixin} from '../core/WindowMixin'; import {WindowMixin} from '../core/WindowMixin.js';
import * as util from '../util/Util'; import * as util from '../util/Util.js';
/** /**