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
844 Commits 51 Branches 0 Tags 15 MiB
main
Commit Graph

844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alain Pitiot
940aa3d60e
Merge pull request #223 from thewhodidthis/bf#222--gui 
core/GUI: Make jQuery UI dialog boxes non-draggable, non-resizable
 2020-12-01 08:17:33 +01:00
Alain Pitiot
bf2a066c8c
Merge pull request #221 from thewhodidthis/bf#191+220--textbox 
visual/TextBox: expose multiline property
 2020-12-01 08:16:58 +01:00
Alain Pitiot
71c0dcecb7
Merge pull request #212 from thewhodidthis/bf#211-tonejs 
Post Tone.js upgrade tweaks
 2020-12-01 08:16:24 +01:00
Alain Pitiot
50e630a124
Merge pull request #146 from thewhodidthis/bf#144--attributes 
util/PsychObject: Expand on the has changed comparison when setting attributes
 2020-12-01 08:14:13 +01:00
Alain Pitiot
9f987d97a6
Merge branch 'master' into bf#144--attributes 2020-12-01 08:14:04 +01:00
Alain Pitiot
abe30c9c6a
Merge pull request #181 from thewhodidthis/bf#168--movie 
Post PIXI upgrade tweaks
 2020-12-01 08:10:04 +01:00
Alain Pitiot
ff6ce2f5dd
Merge pull request #229 from thewhodidthis/bf#226--matchall 
util/Util: fix turnSquareBracketsIntoArrays for older browsers
 2020-12-01 08:08:31 +01:00
Sotiri Bakagiannis
57ac49f649 util/Util: fix turnSquareBracketsIntoArrays for older browsers 
Rely on String.prototype.match() instead of matchAll()
 2020-11-27 14:07:53 +00:00
Sotiri Bakagiannis
d088e832d9 core/GUI: make #msgDialog non-draggable and non-resizable 2020-11-16 12:21:00 +00:00
Sotiri Bakagiannis
8bb7c99cbf core/GUI: make #expDialog non-draggable 2020-11-16 12:20:36 +00:00
Sotiri Bakagiannis
f859d601df visual/TextBox: fix typo in JSDoc comment 2020-11-16 12:11:43 +00:00
Sotiri Bakagiannis
04071ff842 visual/TextBox: expose a multiline property that allows for setting input height 2020-11-16 11:54:59 +00:00
Sotiri Bakagiannis
ae0b37a424 util/PsychObject: have _setAttribute() return true when Object (circular) 2020-11-03 14:24:51 +00:00
Alain Pitiot
85f77e1b39 updated the list of supported components 2020-10-29 14:58:28 +01:00
Alain Pitiot
857b9cba96
Merge pull request #208 from thewhodidthis/bf#206--util-alt 
util/Util: tweak toNumerical() to match JSDoc comment
 2020-10-27 11:29:19 +01:00
Alain Pitiot
3639d9a21f
Merge pull request #192 from thewhodidthis/bf#175--css 
Do hide the "Initialising the experiment..." message on PsychoJS init
 2020-10-27 11:24:50 +01:00
Alain Pitiot
6965c81a70
Merge pull request #188 from pn2200/selectFromArray-fix 
Return selection as an array of arrays
 2020-10-27 11:05:49 +01:00
Alain Pitiot
96bab10712
Merge pull request #178 from thewhodidthis/bf#169--movie 
visual/MovieStim: deal with promise based video play
 2020-10-27 11:03:31 +01:00
Alain Pitiot
413f6d60a3
Merge pull request #164 from thewhodidthis/bf#159+160--textbox 
visual/TextBox: Add methods for accessing the underlying input text
 2020-10-27 10:51:43 +01:00
Sotiri Bakagiannis
b0c67f3634 visual/TextBox: add getter and setter for text prop, plus a reset method 2020-10-15 21:44:10 +01:00
Sotiri Bakagiannis
51a8b69d16 core/GUI: call Tone.start() when hitting OK dialog button 2020-10-15 14:56:18 +01:00
Sotiri Bakagiannis
e22ef2f2ea sound/TonePlayer: post Tone.js upgrade tweaks 2020-10-15 14:53:10 +01:00
Sotiri Bakagiannis
61e128d13f util/Util: fix undefined variable in NaN error message 2020-10-13 20:25:40 +01:00
Sotiri Bakagiannis
a3829c016a js/util: tweak toNumerical() to match JSDoc comment 2020-10-13 19:45:16 +01:00
Alain Pitiot
581acf18aa
Merge pull request #201 from thewhodidthis/bf#200--util 
util/Util: fix selectFromArray() to respect selection order
 2020-10-09 10:48:16 +02:00
Alain Pitiot
c203524c06
Merge pull request #177 from thewhodidthis/bf#176--image 
visual/ImageStim: tweak _estimateBoundingBox() to use size over this._size
 2020-10-09 10:25:49 +02:00
Alain Pitiot
987ef20629
Merge pull request #194 from thewhodidthis/bf#193--gui 
core/GUI: make sure _setRequiredKeys exists before accessing its size
 2020-10-09 10:07:08 +02:00
Alain Pitiot
bcba1faa48
Merge pull request #180 from thewhodidthis/bf#171--window 
Give the PsychoJS.start() expInfo option a default value
 2020-10-09 10:06:20 +02:00
Alain Pitiot
ea83f8c307
Merge pull request #204 from thewhodidthis/bf#189--util 
util/Util: tweak toNumerical error throwing to not rely on this._gui
 2020-10-09 09:37:07 +02:00
Sotiri Bakagiannis
011bebbe7c util/Util: tweak toNumerical error throwing to not rely on this._gui 2020-10-09 08:15:03 +01:00
Sotiri Bakagiannis
3d708d5863 visual/VisualStim: mark opacity as needing pixi updates 2020-10-06 22:53:51 +01:00
Sotiri Bakagiannis
72e9fe5b0b visual/ShapeStim: drop adding opacity attribute in constructor 
Not required, because opacity is one of the attributes passed on
to the parent class via super()
 2020-10-06 22:52:58 +01:00
Sotiri Bakagiannis
54c50a27f4 util/Util: fix selectFromArray() to respect selection order 2020-10-06 10:01:32 +01:00
Sotiri Bakagiannis
717aa3ca4f core/GUI: make sure _setRequiredKeys exists before accessing its size 2020-09-29 20:50:54 +01:00
Sotiri Bakagiannis
e2ff2098e6 css: hide #root::after when PsychoJS initialised 2020-09-29 14:23:28 +01:00
Sotiri Bakagiannis
846b1dca1b core/PsychoJS: give root element an is-ready class on init 2020-09-29 14:22:21 +01:00
Paul Novak
a1f4703dd4 Return selection as an array of arrays 2020-09-23 15:18:55 -07:00
Sotiri Bakagiannis
1b9f14552d visual/MovieStim: fix for PIXI.Texture.fromVideo() deprecated 2020-09-18 16:20:30 +01:00
Sotiri Bakagiannis
050875aa34 visual/MovieStim: drop video cloning, tweak onended event handling 2020-09-18 16:05:10 +01:00
Sotiri Bakagiannis
39196b9119 core/Window: tweak renderer width, height options passing for pixi latest 2020-09-18 16:04:32 +01:00
Sotiri Bakagiannis
1b1dabffb8 core/PsychoJS: make an empty object literal the default expInfo value on start() 2020-09-18 16:00:00 +01:00
Sotiri Bakagiannis
3220e5b1b5 visual/MovieStim: deal with promise based video play 2020-09-18 13:21:18 +01:00
Sotiri Bakagiannis
54166f0cd2 visual/ImageStim: tweak _estimateBoundingBox() to use size over this._size 2020-09-18 12:06:52 +01:00
Alain Pitiot
da2d9c5ad7
Merge pull request #166 from thewhodidthis/bf#165--data 
data/util: Have util export turnSquareBracketsIntoArrays, fix when called inside of importConditions
 2020-09-17 14:04:59 +02:00
Sotiri Bakagiannis
d069665571 data/TrialHandler: clean up comment 2020-09-08 16:23:57 +01:00
Sotiri Bakagiannis
b65c9b8489 data/TrialHandler: clear up comment 2020-09-07 22:41:48 +01:00
Sotiri Bakagiannis
03e7e48d6e data/TrialHandler: reorder parsing of cell value, clean up 2020-09-07 22:37:02 +01:00
Sotiri Bakagiannis
968070436a data/TrialHandler: fix attempted destructuring on non arrays 
When calling `Util.turnSquareBracketsIntoArrays()`, forget
about destructuring ahead of checking whether the result
is an array, just take the first element if it is.
 2020-09-07 18:20:02 +01:00
Sotiri Bakagiannis
6523a4a404 util/Util: do export turnSquareBracketsIntoArrays 2020-09-07 18:18:39 +01:00
Sotiri Bakagiannis
dc1b0f10ac util/PsychObject: clean up 2020-09-07 14:11:07 +01:00