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
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
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
Sotiri Bakagiannis
25a49771e5
visual/TextBox: add clear method, tweak reset to take editable into account
2021-06-15 17:13:19 +01:00
Sotiri Bakagiannis
c41554c1ef
visual/Slider: add lineColor option, borderColor alias
2021-06-15 16:24:00 +01:00
Alain Pitiot
7a9cdcfd27
Merge branch 'psychopy:main' into master
2021-06-15 16:15:46 +02:00
Alain Pitiot
198becd71e
getSnapshot / fromSnapshot now also store/restore the trial attributes
2021-06-15 16:11:33 +02:00
Sotiri Bakagiannis
e868f941f9
visual/TextInput: access a text value, only disable text substitution when multiline
2021-06-15 14:33:07 +01:00
Sotiri Bakagiannis
d3e3a67a80
visual/TextBox: pass text value on to text input
2021-06-15 14:32:23 +01:00
Alain Pitiot
6ecb96b561
Merge branch 'main' into bf#348--no-moment
2021-06-15 14:49:10 +02:00
Alain Pitiot
3d9eb73840
changed the API of Microphone to be consistent with the other Stimuli, i.e. passing Window instead of PsychoJS; handled transcription error in AudioClip
2021-06-15 11:15:50 +02:00
Sotiri Bakagiannis
29795025b9
visual/TextInput: upgrade to PIXI.TextInput latest, with patches applied
2021-06-14 21:06:52 +01:00
Sotiri Bakagiannis
77cdfa9646
visual/Form: clean up slider options merging
2021-06-11 20:57:51 +01:00
Sotiri Bakagiannis
f372162553
visual/Form: add granularity per item override
2021-06-11 20:45:53 +01:00
Sotiri Bakagiannis
19c062c77c
visual/Form: add Form.Type.SLIDER support
2021-06-11 20:38:37 +01:00
Sotiri Bakagiannis
2776ad417f
visual/Form: no need to alias RADIO as CHOICE type in Form.Types
2021-06-11 20:31:59 +01:00
Alain Pitiot
9865eaba4a
fromSnapshot now handles thisTrial as well
2021-06-11 15:29:36 +02:00
Alain Pitiot
598fa080ee
added a getter for finished in TrialHandler
2021-06-11 15:16:02 +02:00
Alain Pitiot
cad60bb964
Merge pull request #390 from thewhodidthis/bf#322--slider
...
visual/Slider: provide fillColor aliases for markerColor
2021-06-11 10:19:18 +02:00
Alain Pitiot
c753469e1c
Merge pull request #385 from thewhodidthis/bf#341--textbox-scroll
...
visual/TextInput: permanently disable substitute text
2021-06-11 10:18:22 +02:00
Alain Pitiot
c9b19c657b
added the notion of dependent stimuli to Slider, in order to accommodate a more standard way of rendering Form in the generated .js code, i.e. form.setAutoDraw(true), rather than the historically correct form.draw()
2021-06-11 10:12:59 +02:00
Sotiri Bakagiannis
0e3a23f5d0
visual/Slider: provide fillColor aliases for markerColor
2021-06-11 08:45:05 +01:00
Alain Pitiot
94264e3e75
Merge pull request #387 from apitiot/master
...
added fromSnapshot static method to TrialHandler
2021-06-11 07:24:33 +02:00
Alain Pitiot
fcd7642bee
added fromSnapshot static method to TrialHandler to restore internal state from snapshot; should fix the nested loop thisN issue
2021-06-11 07:20:30 +02:00
Sotiri Bakagiannis
13461b9169
visual/TextInput: permanently disable substitute text
2021-06-10 18:38:54 +01:00
Alain Pitiot
b9aee09474
Merge pull request #382 from tpronk/fix_seedrandom
...
BF: Make seedrandom work again
2021-06-10 15:26:00 +02:00
Thomas Pronk
fb0b231014
RF: follow PsychoJS style guide
2021-06-10 13:13:41 +01:00
Thomas Pronk
170cf423d3
RF: leverage _setAttribute, rename rng to randomNumberGenerator
2021-06-09 16:04:57 +01:00
Thomas Pronk
6c292ea2d9
RF: use seed getter and setter via _addAttribute
2021-06-09 14:32:52 +01:00
Thomas Pronk
148dda46ff
BF: Make seedrandom work again
...
This bug-fix consists of modifications to util.shuffle and TrialHandler:
1) util.shuffle supports an optional second argument, rng, which defaults to Math.random
2) TrialHandler now has a getter and setter for the seed attrbute. On setting this attribute it constructs a random number generator (rng) using seedrandom using the seed provided. This rng is passed to to util.shuffle when preparing a sequence with method RANDOM or FULL_RANDOM
2021-06-09 13:57:28 +01:00
Alain Pitiot
bad98abde7
Merge pull request #378 from thewhodidthis/bf#318--textbox
...
visual/TextInput: use nullish coalescing operator for stroke styling fallbacks
2021-06-09 14:00:07 +02:00
Sotiri Bakagiannis
92d97f1f83
core/ServerManager: drop preloadjs import
2021-06-09 07:26:53 +01:00
Sotiri Bakagiannis
e2a9d08de8
visual/TextInput: use nullish coalescing operator for stroke styling
...
fallbacks
2021-06-08 19:03:17 +01:00
Alain Pitiot
db9b6dd69e
Merge branch 'main' into bf#367--movie-preload
2021-06-08 13:52:21 +02:00
Thomas Pronk
d9c5f816ee
Check more carefully whether the error properties exist
2021-06-07 12:17:16 +01:00
Sotiri Bakagiannis
e77688ce56
core/ServerManager: import PreloadJS for side effects
2021-06-07 11:38:13 +01:00
Sotiri Bakagiannis
4c1426dea5
util/Clock: split date formatting and parsing into separate funcs, drop moment import
2021-06-04 11:50:20 +01:00
Thomas Pronk
f11e356653
RF: clean up improved error logging
2021-06-03 18:13:36 +01:00
Thomas Pronk
e1813c2e03
BF: properly log errors thrown by PsychoJS itself
2021-06-03 18:06:39 +01:00
Thomas Pronk
ccfc44a4ce
ENH: Add error logging for unhandled rejections
2021-06-03 11:56:34 +01:00
Sotiri Bakagiannis
5b202eb396
Merge branch 'main' into bf#348--no-moment
2021-06-02 13:51:28 +01:00
Sotiri Bakagiannis
7d3a264818
data: comment out the Shelf
2021-06-02 13:20:08 +01:00
Sotiri Bakagiannis
3ce93c9642
Merge branch 'main' into bf#357-bundling
2021-06-02 13:12:18 +01:00
Alain Pitiot
725e5ca28f
updated version number
2021-06-02 13:53:50 +02:00
Sotiri Bakagiannis
bf4fe0b3db
sound: drop Transcriber export for now
2021-06-01 17:44:55 +01:00
Alain Pitiot
9e10fa489a
_
2021-06-01 13:35:51 +02:00
Alain Pitiot
823834d904
_
2021-06-01 13:32:21 +02:00
Alain Pitiot
ba8d6f5092
_
2021-06-01 13:28:36 +02:00
Alain Pitiot
0bac3ee235
Merge branch 'master' of github.com:apitiot/psychojs
2021-06-01 11:04:53 +02:00
Alain Pitiot
7ebca99430
_
2021-06-01 11:04:48 +02:00
Alain Pitiot
27ffab0447
Merge branch 'psychopy:main' into master
2021-06-01 11:03:50 +02:00
Alain Pitiot
ef08c44c02
added missing docs
2021-05-31 13:49:13 +02:00
Alain Pitiot
4cf0367468
Merge branch 'main' into bf#334--font
2021-05-31 13:04:09 +02:00
Alain Pitiot
f9df73b4fe
Merge branch 'main' into bf#334--font
2021-05-31 13:04:09 +02:00
Alain Pitiot
e4aec61fcd
Merge pull request #354 from thewhodidthis/bf#300-gui
...
core/GUI: restore warning about required fields
2021-05-31 13:00:06 +02:00
Alain Pitiot
b0a97cf3e6
Merge pull request #354 from thewhodidthis/bf#300-gui
...
core/GUI: restore warning about required fields
2021-05-31 13:00:06 +02:00
Alain Pitiot
f5b06bff0b
Merge pull request #340 from tpronk/textbox_stay_on_resize
...
BF: Retain entered text (and placeholder) upon resize
2021-05-31 12:46:19 +02:00
Alain Pitiot
04b21a4274
Merge pull request #340 from tpronk/textbox_stay_on_resize
...
BF: Retain entered text (and placeholder) upon resize
2021-05-31 12:46:19 +02:00
Alain Pitiot
56655a1d85
Merge branch 'main' into nf#335--deps
2021-05-31 11:59:19 +02:00
Alain Pitiot
811c7fee11
Merge branch 'main' into nf#335--deps
2021-05-31 11:59:19 +02:00
Alain Pitiot
721b88631a
_
2021-05-31 09:25:09 +02:00
Alain Pitiot
023940735b
Merge branch 'master' into main
2021-05-31 08:47:47 +02:00
Alain Pitiot
54e57c46c1
Merge branch 'master' into main
2021-05-31 08:47:47 +02:00
Alain Pitiot
0873570bae
Merge branch 'master' into main
2021-05-31 08:47:47 +02:00
Alain Pitiot
aad2753a0b
_
2021-05-31 08:32:35 +02:00
Alain Pitiot
f155192fd5
_
2021-05-31 08:32:35 +02:00
Alain Pitiot
60cfc55627
_
2021-05-31 08:32:35 +02:00
Sotiri Bakagiannis
dc068df9a0
src/*: use imports for deps
2021-05-27 19:21:03 +01:00
Sotiri Bakagiannis
191ca3458e
core/GUI: restore warning about required fields
2021-05-27 11:17:28 +01:00
Sotiri Bakagiannis
43be6cad04
util/Clock: fix JSDoc
2021-05-25 13:12:14 +01:00
Sotiri Bakagiannis
78b4466c6a
util/Clock: drop the ISO part in favour of session specific timestamps
2021-05-25 12:18:29 +01:00
Sotiri Bakagiannis
e35113da7d
Merge branch 'main' into bf#348--no-moment
2021-05-25 11:32:18 +01:00
Alain Pitiot
fbd30ab2db
Merge pull request #345 from thewhodidthis/bf#339--trial-handler
...
data/TrialHandler: allow for calling next() like PsychoPy
2021-05-25 11:04:17 +02:00
Alain Pitiot
f23b696814
Merge pull request #349 from thewhodidthis/bf#346--sound
...
sound/TrackPlayer: drop extra play / seek calls
2021-05-25 10:39:16 +02:00
Sotiri Bakagiannis
ee1edfa99c
data/TrialHandler: drop the getter on trialIterator
2021-05-25 09:35:55 +01:00
Alain Pitiot
37c4e2d9de
Merge pull request #333 from thewhodidthis/nf#315--form
...
visual/Slider/Form/TextBox: towards implementing five color model
2021-05-25 10:27:22 +02:00
Sotiri Bakagiannis
ec17ceb303
util/Clock: drop moment and the format argument from getDateStr()
2021-05-24 13:16:56 +01:00
Sotiri Bakagiannis
61ea059cd5
sound/TrackPlayer: drop extra play / seek calls
2021-05-21 07:44:53 +01:00
Sotiri Bakagiannis
91f5c86adc
data/TrialHandler: add next method, trialIterator getter
2021-05-19 17:18:47 +01:00
Thomas Pronk
de2b210e99
Retain entered text (and placeholder) upon resize
2021-05-17 23:10:47 +01:00
Sotiri Bakagiannis
864eab588a
visual/Slider: clean up JSDoc for font, use Arial by default
2021-05-17 14:26:06 +01:00
Sotiri Bakagiannis
4cc9630610
visual/Form: support font property
2021-05-17 14:22:22 +01:00
Alain Pitiot
0121eeab1d
Merge pull request #320 from thewhodidthis/bf#290--bom
...
data/ExperimentHandler: prepend BOM when exporting CSV
2021-05-16 16:51:17 +02:00
Alain Pitiot
1ee86be4f8
Merge pull request #327 from thewhodidthis/nf#316--button
...
Implement ButtonStim class
2021-05-16 16:48:12 +02:00
Sotiri Bakagiannis
0cafac1689
visual/Slider/Form/TextBox: towards implementing five color model
2021-05-14 20:59:30 +01:00
Sotiri Bakagiannis
52b53376d8
visual/ButtonStim: make sure isClicked tracks left mouse button presses only
2021-05-10 16:14:09 +01:00
Sotiri Bakagiannis
335f7dfece
visual/TextBox: import ButtonStim class
2021-05-10 14:33:37 +01:00
Sotiri Bakagiannis
6e5f63baff
visual/ButtonStim: fix class name
2021-05-10 14:33:08 +01:00
Sotiri Bakagiannis
6e1befa8c6
visual: export ButtonStim
2021-05-10 14:04:46 +01:00
Sotiri Bakagiannis
61e41553d3
visual/TextBox+TextInput: skip event listeners for ButtonStim
2021-05-10 14:04:32 +01:00
Sotiri Bakagiannis
05eb0aabf0
visual/ButtonStim: translate over from PsychoPy
2021-05-10 13:52:40 +01:00
Sotiri Bakagiannis
2d299c7730
Merge pull request #326 from RebeccaHirst/_addformComplete
...
add formComplete method (code cleanup)
2021-05-10 11:58:19 +01:00
RebeccaHirst
cfc2debcf6
cleanup formcomplete
2021-05-10 11:18:18 +01:00
Rebecca Hirst
bdc3915b23
Update Form.js
2021-05-07 23:29:56 +01:00
Sotiri Bakagiannis
98a5de434f
data/ExperimentHandler: tweak for XLSX not prepending BOM when converting to csv
2021-05-07 14:33:03 +01:00
Thomas Pronk
9c28f51817
Write captured errors to body.data-report attribute
2021-04-29 15:29:46 +01:00
RebeccaHirst
99247a8f13
remove complete as method
2021-04-19 12:57:27 +01:00
RebeccaHirst
d5006a0c9a
add doc to complete
2021-04-19 11:52:34 +01:00
RebeccaHirst
3e637bd0bb
Merge branch 'master' of https://github.com/RebeccaHirst/psychojs
2021-04-19 11:50:39 +01:00
Sotiri Bakagiannis
752337184a
core/Window: fix import paths for rollup
2021-04-15 13:59:56 +01:00
Sotiri Bakagiannis
678712b26e
css: clean up
2021-04-15 13:49:20 +01:00
Sotiri Bakagiannis
3adfe76621
git: move stylesheet into src dir
2021-04-15 13:48:11 +01:00
Sotiri Bakagiannis
e1df2bc19c
js/src: add index files to re-export components from each module folder
2021-04-15 13:45:13 +01:00
Sotiri Bakagiannis
bcbf62e724
git: rename js folder to src
2021-04-15 13:39:02 +01:00
