1
0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 10:40:54 +00:00
Commit Graph

566 Commits

Author SHA1 Message Date
Sotiri Bakagiannis
61fb7744a1 dprint: prefer double quotes only if it makes sense 2021-07-09 14:06:22 +01:00
Sotiri Bakagiannis
6c92771864
Merge pull request #431 from thewhodidthis/main
Fix import paths
2021-07-09 13:51:30 +01:00
Sotiri Bakagiannis
67873dabd4 visual: fix import paths 2021-07-09 13:50:36 +01:00
Sotiri Bakagiannis
7f6b37d720 sound: fix import paths 2021-07-09 13:47:36 +01:00
Sotiri Bakagiannis
24f43ccbbb data: fix import paths 2021-07-09 13:45:56 +01:00
Sotiri Bakagiannis
904c6e216d core: fix import paths 2021-07-09 13:44:22 +01:00
Sotiri Bakagiannis
9d37366d5d util: fix import paths 2021-07-09 13:12:54 +01:00
Sotiri Bakagiannis
74385b7325
Merge pull request #430 from thewhodidthis/main
util/Util: add more unit tests
2021-07-09 13:01:29 +01:00
Sotiri Bakagiannis
6b856e99c3 util/Util: add more unit tests 2021-07-09 13:00:55 +01:00
Sotiri Bakagiannis
0d5cda24c7
Merge pull request #429 from thewhodidthis/main
util/visual: separate out PIXI specific util and adjust imports
2021-07-09 12:35:49 +01:00
Sotiri Bakagiannis
a5dbe83a3d util/visual: separate out PIXI specific util and adjust imports 2021-07-09 12:34:06 +01:00
Sotiri Bakagiannis
6147cdbb8a
Merge pull request #428 from thewhodidthis/bf#427--numeric
sound/TonePlayer: replace $.isNumeric with custom util func
2021-07-09 08:48:13 +01:00
Sotiri Bakagiannis
4a94508c46 util/Util: add toNumeric unit test 2021-07-09 08:47:20 +01:00
Sotiri Bakagiannis
68333826d5 Merge branch 'main' into bf#427--numeric 2021-07-09 07:55:17 +01:00
Sotiri Bakagiannis
a8c4b46ae8 scripts: fix for dprint 2021-07-09 07:54:03 +01:00
Sotiri Bakagiannis
3d635cc355 package: add fmt script 2021-07-09 07:50:50 +01:00
Sotiri Bakagiannis
f6bd9b9448 package: add dprint config 2021-07-09 07:49:31 +01:00
Sotiri Bakagiannis
8e01f3f7e6 package: add dprint 2021-07-09 07:48:59 +01:00
Sotiri Bakagiannis
898e2b5749 eslint: tweak config 2021-07-09 07:47:08 +01:00
Sotiri Bakagiannis
1eecdfda5d readme: clean up 2021-07-09 07:37:53 +01:00
Sotiri Bakagiannis
b02d907964 sound/TonePlayer: replace $.isNumeric 2021-07-08 17:52:36 +01:00
Sotiri Bakagiannis
c2b38cb550 util/Util: add custom isNumeric func 2021-07-08 17:52:12 +01:00
Sotiri Bakagiannis
2202173bbc
Merge pull request #396 from thewhodidthis/bf#384--text-input
visual/TextInput: upgrade to PIXI.TextInput latest, with patches applied
2021-07-08 14:44:50 +01:00
Sotiri Bakagiannis
b1af859427 Merge branch 'main' into bf#384--text-input 2021-07-08 14:44:06 +01:00
Alain Pitiot
6211e606dd
Update package.json 2021-07-07 16:11:35 +02:00
Sotiri Bakagiannis
ebc128a2b6
Merge pull request #420 from thewhodidthis/bf#209+210--css
core/GUI: clean up dialog pane sizing parts, use css
2021-07-07 14:58:11 +01:00
Sotiri Bakagiannis
d9c5aac1c4
Merge pull request #426 from thewhodidthis/bf#425--clock
core/ServerManager: do import Clock
2021-07-07 14:43:15 +01:00
Sotiri Bakagiannis
966e7a5b39 core/ServerManager: do import Clock 2021-07-07 14:42:34 +01:00
Alain Pitiot
72baa6f64b
Merge pull request #423 from apitiot/master
_
2021-06-25 08:24:06 +02:00
Alain Pitiot
7e63f88aa4 _ 2021-06-25 08:23:09 +02:00
Alain Pitiot
d44919c75c
Merge pull request #422 from apitiot/master
added more features to AudioClip and AudioClipPlayer
2021-06-25 07:43:15 +02:00
Alain Pitiot
d8283885c5
Merge branch 'psychopy:main' into master 2021-06-25 07:39:31 +02:00
Alain Pitiot
89892ff545 Added more features to AudioClip and AudioClipPlayer; fixed import of JSON resource files 2021-06-25 07:38:21 +02:00
Sotiri Bakagiannis
9038281dc9 css: give dialogs a max width for screens < 500 2021-06-23 16:29:22 +01:00
Sotiri Bakagiannis
9f2c16f2a9 core/GUI: clean up dialog sizing extras 2021-06-23 16:28:24 +01:00
Sotiri Bakagiannis
ffb75f996c css: drop scaling of dialog boxes, clean up 2021-06-23 16:11:41 +01:00
Alain Pitiot
392c124054
Merge pull request #412 from thewhodidthis/bf#411--slider
visual/Slider: bring style symbols inline with PsychoPy
2021-06-23 09:19:03 +02:00
Sotiri Bakagiannis
9b1a0ed785
Merge pull request #418 from thewhodidthis/bf#416--minify
scripts: tweak js minification options to leave identifiers as is
2021-06-21 17:40:29 +01:00
tpronk
8b360a9947
BF: disable scheduled runs 2021-06-21 17:24:08 +01:00
Sotiri Bakagiannis
1dc3eabd0d scripts: tweak js minification options to leave identifiers as is 2021-06-21 16:57:44 +01:00
Alain Pitiot
f0d42a811e
Merge pull request #417 from apitiot/master
fromSnapshot now creates a global variable for the trial
2021-06-21 14:34:33 +02:00
Alain Pitiot
b9228bc65f fromSnapshot now creates a global variable for the trial, such that loop.thisTrial['field'] === thisLoop['field'] 2021-06-21 14:33:22 +02:00
Alain Pitiot
2a0d213c74
Merge pull request #415 from apitiot/master
added AudioClip Player (minimal skeleton), minor fixes, updated documentation
2021-06-21 07:40:31 +02:00
Alain Pitiot
d9c587b34e updated documentation; added jsdoc configuration file 2021-06-21 07:38:07 +02:00
Alain Pitiot
8b15ac5fcc try and keep the size of the licensee logo reasonable in the pop up experiment window 2021-06-21 07:08:53 +02:00
Alain Pitiot
2c3e571193 minor corrections to TrialHandler.setSeed 2021-06-21 07:06:22 +02:00
Alain Pitiot
fc80e8ade9 added skeleton of AudioClip Player 2021-06-18 16:55:34 +02:00
Sotiri Bakagiannis
2acbca7fd0 visual/Slider: bring style symbols inline with PsychoPy 2021-06-18 13:31:57 +01:00
Sotiri Bakagiannis
b8956f5c4f
Merge pull request #394 from thewhodidthis/bf#322--slider
Do support Form.Types.SLIDER
2021-06-16 16:11:54 +01:00
Alain Pitiot
9cecf2984f
Merge pull request #406 from thewhodidthis/bf#404--textbox
visual/TextBox: add clear method, tweak reset to take editable into account
2021-06-15 19:28:34 +02:00