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

811 Commits

Author SHA1 Message Date
Alain Pitiot
2eb38f0705 _ 2020-08-20 12:02:37 +02:00
Alain Pitiot
6e8f3bf612 revised the attribute mechanisms; various bug fixes and performance improvements 2020-08-20 11:59:56 +02:00
Alain Pitiot
6883ffa0fc
Merge pull request #135 from thewhodidthis/bf#133--seeking
visual/Movie: add currentTime fallback when video seeking
2020-08-20 09:41:55 +02:00
Alain Pitiot
6bdc7668a1
Merge pull request #143 from thewhodidthis/bf#116--movie
core/Window: lose gl extension context before PIXI renderer
2020-08-20 09:40:26 +02:00
Alain Pitiot
7bcec8394d
Merge pull request #137 from thewhodidthis/bf#2299--csv
data/TrialHandler: PR#95 follow up decoding .csv conditions imports
2020-08-20 08:50:01 +02:00
Alain Pitiot
8fa7fdeeab
Merge pull request #145 from thewhodidthis/bf#139--docs
visual/ImageStim: fix JSDoc typo
2020-08-20 08:47:25 +02:00
Sotiri Bakagiannis
fec54b41e5 util/PsychObject: fix comment typo 2020-08-19 16:18:42 +01:00
Sotiri Bakagiannis
056ea555e5 util/PsychObject: expand on the has changed comparison when setting attributes 2020-08-19 13:30:36 +01:00
Sotiri Bakagiannis
7ae5d6ad88 visual/ImageStim: fix JSDoc typo 2020-08-18 17:32:02 +01:00
Sotiri Bakagiannis
cd3163b444 core/Window: lose gl extension context before PIXI renderer 2020-08-17 10:43:11 +01:00
Sotiri Bakagiannis
590e9c8e2e visual/MovieStim: DOM clone video baseTexture during setMovie call
Workaround required because of the way movie status is
updated outside any video playback event listeners.
2020-08-17 09:43:27 +01:00
Sotiri Bakagiannis
cffabdd0df data/TrialHandler: cleanup PR#95 to do with decoding .csv conditions imports 2020-08-05 15:15:45 +01:00
Sotiri Bakagiannis
7f4cc1eaf4 visual/Movie: add currentTime fallback when seeking 2020-08-05 08:56:58 +01:00
Alain Pitiot
fa39a7bfbc added Form and TextBox; added boundingBox attribute and contains method to VisualStim; various performance improvements to all visual stimuli 2020-08-05 09:32:53 +02:00
Alain Pitiot
640ae93a04
Merge pull request #105 from thewhodidthis/nf#104--mouse
core/Mouse: add isPressedIn method
2020-08-03 16:47:32 +02:00
Alain Pitiot
30cbdf3669
Merge pull request #102 from thewhodidthis/bf#101--css
css: center root pseudo message using tranform/translate
2020-08-03 16:45:42 +02:00
Alain Pitiot
88548e23d8
Merge pull request #100 from thewhodidthis/bf#87--orientation
visual/VisualStim: flip rotations to reflect psychopy convention
2020-07-31 16:24:26 +02:00
Alain Pitiot
e3f8e7593c
Merge pull request #119 from thewhodidthis/bf#115--gui
core/GUI: swap placement of OK/Cancel dialog box buttons
2020-07-31 16:23:34 +02:00
Alain Pitiot
58947e5fa4
Merge pull request #122 from thewhodidthis/nf#121--randint
util/Util: add NumPy inspired randint method
2020-07-31 16:22:37 +02:00
Alain Pitiot
770d02d156
Merge branch 'master' into nf#121--randint 2020-07-31 16:22:25 +02:00
Alain Pitiot
8bb4753d20
Merge pull request #107 from peircej/master
BF: allow UK English names for colours. Any others?
2020-07-31 16:17:45 +02:00
Alain Pitiot
a447a495e5
Merge pull request #129 from thewhodidthis/nf#128--math
util/Util: add Crib Sheet math extras
2020-07-31 16:16:29 +02:00
Alain Pitiot
394311e650
Merge pull request #112 from thewhodidthis/nf#111--release
core/MinimalStim: add release method
2020-07-31 16:13:21 +02:00
Sotiri Bakagiannis
2088cf75c7 util/Util: add sum helper 2020-07-30 14:57:55 +01:00
Sotiri Bakagiannis
9308989117 util/Util: add round helper 2020-07-30 14:55:28 +01:00
Sotiri Bakagiannis
2fd6c30ddf data/ExperimentHandler: drop duplicate isEntryEmpty method 2020-07-29 09:36:26 +01:00
Sotiri Bakagiannis
7fd83d2ead util/Util: fix randint error message 2020-07-28 21:37:24 +01:00
Sotiri Bakagiannis
97542f794a util/Util: line separate the just added function opening brace 2020-07-28 15:18:17 +01:00
Sotiri Bakagiannis
7688f8df92 util/Util: add randint helper 2020-07-28 15:02:32 +01:00
Sotiri Bakagiannis
f4b9717467 core/GUI: swap placement of OK/Cancel dialog box buttons 2020-07-27 12:14:47 +01:00
Sotiri Bakagiannis
5b69621ffa core/MinimalStim: add release method 2020-07-24 17:11:40 +01:00
Sotiri Bakagiannis
e0b7bc8d5b visual/Image/Text/Movie/Shape: call destroy on internal pixi instance before updating across stimulus classes 2020-07-24 17:00:37 +01:00
Sotiri Bakagiannis
30755dbcb2 data/util: add missing semicolons 2020-07-24 15:28:59 +01:00
Sotiri Bakagiannis
cae18a0a3b data/TrialHandler: look for arrays in square brackets when importing conditions 2020-07-24 09:51:05 +01:00
Sotiri Bakagiannis
2a6138e4da util/Util: add turnSquareBracketsIntoArrays helper 2020-07-24 09:51:00 +01:00
Sotiri Bakagiannis
43dedcb7f7 core/Mouse: clean up JSDoc 2020-07-17 16:46:36 +01:00
Sotiri Bakagiannis
2909dabf83 core/Mouse: clean up mostly JSDoc 2020-07-17 15:06:58 +01:00
Sotiri Bakagiannis
460ba1998d core/Mouse: clean up comments 2020-07-17 12:30:15 +01:00
Sotiri Bakagiannis
d023ed3b8c core/Mouse: tweak isPressedIn to cover all types of arguments
Bring in line with PsychoPy by accepting arguments as follows:
(a) mouse.isPressedIn({"shape": myStim, "buttons": 1})
(b) mouse.isPressedIn(myStim, {"buttons": 1})
(c) mouse.isPressedIn(myStim, 1)
2020-07-16 17:21:04 +01:00
Jon Peirce
d3a71cd18d BF: allow UK English names for colours. Any others? 2020-07-16 16:50:28 +01:00
Sotiri Bakagiannis
e37eb5270a core/Mouse: add isPressedIn method 2020-07-14 12:57:20 +01:00
Sotiri Bakagiannis
e72da164ea css: center root pseudo message using tranform/translate
Should work unprefixed down to IE11.
2020-07-07 11:08:07 +01:00
Sotiri Bakagiannis
f12ccafff3 visual/VisualStim: flip rotations to reflect psychopy convention
The documentation for `setOri()` on `VisualStim` now
accurately reflects the mapping of negative values to
counter-clockwise rotations and vice versa.
2020-07-07 10:52:06 +01:00
Alain Pitiot
08972dae90
Merge pull request #99 from thewhodidthis/bf#53+83--slider
visual/Slider: override refresh method a-la ShapeStim
2020-07-03 14:38:41 +02:00
Alain Pitiot
1fc76d1461 complete linting, saving of partial results, improved GUI, various bug fixes 2020-07-03 14:26:43 +02:00
Sotiri Bakagiannis
2ba835f5c2 visual/Slider: override refresh method a-la ShapeStim
Insert a `refresh()` method into the `Slider` component to
switch on the `_needVertexUpdate` property so that resizing
the `Window` properly reflects on instance position.
2020-07-03 11:45:12 +01:00
Sijia Zhao
3ee07c994c BF: Remove <form>...</form> elements
Leaving the elements means that a user can press enter to submit the form. Since there is no action="..." attribute, will default to submitting the form to the current page, effectively causing a page reload. Because the intention is for the user to proceed by pressing the 'Ok' button on the jQuery dialog, this only causes an annoyance to the user.
2020-05-27 22:08:14 +01:00
Alain Pitiot
8276bd790a replace jquery escapeSelector by CSS.escape since the latter is standard and the former is only available in jquery 3.0 2020-05-24 14:23:00 +02:00
Alain Pitiot
c48af52eec
Merge pull request #90 from sijiazhao/master
BF: Multiple fixes, mostly re GUI dlg; fixes #52
2020-05-24 14:07:25 +02:00
Alain Pitiot
f688b65cd0
Merge branch 'master' into master 2020-05-24 14:03:00 +02:00