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

65 Commits

Author SHA1 Message Date
Alain Pitiot
1fc76d1461 complete linting, saving of partial results, improved GUI, various bug fixes 2020-07-03 14:26:43 +02: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
Alain Pitiot
934484e054 cancel a recent change to slider which seems to be creating issues; take devicePixelRatio into account in Windows 2020-05-24 13:45:32 +02:00
Sijia Zhao
584d76a04f Dialogs now properly destroyed and removed from DOM when closed
Ensures dialogs are immediately removed from DOM when closed.
Previously, dialogs were destroyed but not removed causing possibility of duplicate element IDs, so jQuery unitentionally selects and recreates old dialogs, thus  GUI._updateOkButtonStatus updates the wrong button.
2020-05-19 19:31:29 +01:00
Sijia Zhao
88827706ea ServerManager.downloadResources, ._downloadRegisteredResources: only process and download new resources, ignore existing resources
Old behaviour of ._downloadRegisteredResources attempts to download all registered resources, regardless of whether they have been previously downloaded. howler.js appears to ignore requests to re-download, however PreloadJS will redownload, which can cause critical errors if a resource is being used while being unnecessarily redownloaded
2020-05-19 19:22:19 +01:00
Sijia Zhao
0f9eeb636e GUI._onKeyChange now properly handles dropdown boxes
Now use a Map to keep track of individual elements to prevent duplication.
Previously would increment continuously just by switching dropdown options. So users could bypass the requirement to complete starred(*) fields by toggling a dropdown a few times, or by focussing and unfocussing input elements, causing nbSetRequiredKeys++ to increment without limit.
2020-05-19 19:07:48 +01:00
Sijia Zhao
dd23484cf5 Remove need to unfocus/deselect input elements in DlgFromDict before being able to click the "Ok" button
GlobalEventHandlers.onchange only fires when focus is lost. However .oninput fires whenever contents are modified. Original requires "double click" behaviour: first click to deselect the input element, second click to actually click the "Ok" button. Old code results in "Ok" buttons remaining visually disabled thus confusing users even when input elements have been completed
2020-05-19 18:58:52 +01:00
Sijia Zhao
e907c0c897 Prevent special characters in DlgFromDict dictionary causing DOM element selection problems
Use
$.escapeSelector()

Requires jQuery 3.0+
2020-05-19 18:47:16 +01:00
Sijia Zhao
4b064bccc0 Fix DlgFromDict form labels not focussing/selecting corresponding input element
Use
htmlCode += '<label for="' + keyId + '">' + key + '</label>';
2020-05-19 18:42:59 +01:00
Sijia Zhao
d4b52796c9 Fix blurry Pixi canvas
Add
resolution: window.devicePixelRatio,
2020-05-19 18:40:56 +01:00
Alain Pitiot
092829f325 Merge branch 'master' of https://github.com/psychopy/psychojs 2020-05-12 18:34:05 +02:00
Alain Pitiot
1cf40c4d8a _ 2020-05-12 18:31:11 +02:00
Alain Pitiot
feddfa550a
Merge pull request #86 from tpronk/master
Add Blink detection
2020-05-06 08:03:30 +02:00
tpronk
9a11171ba2 Update Util.js 2020-04-30 15:56:31 +02:00
tpronk
926ec69386 Update Util.js
Added Blink detection (from snippet at https://stackoverflow.com/a/9851769)
2020-04-30 15:51:31 +02:00
Alain Pitiot
0ca9e118a4 Merge branch 'master' of github.com:psychopy/psychojs 2020-02-14 08:22:33 +01:00
Alain Pitiot
4942e0156e 2020.1 branch 2020-02-14 08:18:25 +01:00
Jon Peirce
0a5341b982
Fixed typo in readme
Fixes #76
2020-02-06 10:01:17 +00:00
Alain Pitiot
b0dd70222a small edits to README 2019-08-01 14:08:08 +02:00
Alain Pitiot
b546ffea67 added a change log 2019-08-01 13:55:13 +02:00
Alain Pitiot
66bcefe1f1 small edits to Sound and TonePlayer 2019-08-01 13:35:20 +02:00
Alain Pitiot
b461e224a6 TonePlayer: test for Tone.js (it does not load in IE11) and play sound indefinitely if duration_s == -1 2019-08-01 11:29:14 +02:00
Alain Pitiot
039a8671c7 fixed issues: fullscreen mode, size of triangular marker in sliders; new features: window waitblanking 2019-07-31 10:37:51 +02:00
Alain Pitiot
e9f249bcde adequately deal with mixed letter+number values in condition file 2019-07-08 10:02:51 +02:00
Alain Pitiot
845a43338d 3.1.4 docs 2019-07-08 09:07:09 +02:00
Alain Pitiot
d20a4cb0a5 version 3.1.4 2019-07-08 09:05:15 +02:00
Alain Pitiot
9c4749d012
Merge pull request #60 from psychopy/editorConfig
ENH: adds .editorconfig file to repo
2019-06-21 14:00:36 +02:00
David Bridges
9700f08652 ENH: adds .editorconfig file to repo
The indentation in JS and HTML looks wrong because of GitHubs default
settings (I think is 8 spaces for an indent?). This .editorconfig file
allows us to define what indentation params should be used for specific
file types, making the JS more readable and consistent with code style
convention.
2019-06-21 10:11:39 +01:00
Alain Pitiot
982033a1b9 Merge branch 'master' of github.com:psychopy/psychojs 2019-04-19 09:50:37 +02:00
Alain Pitiot
03f06ac64a version 3.0.8 2019-04-19 09:50:14 +02:00
Alain Pitiot
8cd8a75baa
Merge pull request #45 from peircej/master
Fix: setReadOnly(false) was having no effect
2019-04-15 17:01:26 +02:00
Jon Peirce
6b99d612c8
Merge pull request #47 from earcanal/patch-1
Update Scheduler.js
2019-04-11 18:55:15 +01:00
earcanal
f3813a322c
Update Scheduler.js
Typo.
2019-04-11 16:54:25 +01:00
Jon Peirce
1fbb67a5e6
Merge pull request #46 from psychopy/rectSetSize
BF: Add setSize method to Rect
2019-04-11 13:29:01 +01:00
David Bridges
fb8115c68e BF: Add setSize method to Rect
Related to https://github.com/psychopy/psychojs/issues/44 point 2. This
fix allows users to call setSize to change rect size, as with Python code.
To change rect size, the setSize method calls the setWidth and
setHeight methods of Rect stim.
2019-04-11 13:01:58 +01:00
Jon Peirce
9f0d4f75ce Fix: setReadOnly(false) was having no effect
As noted in this discourse post:
https://discourse.psychopy.org/t/slider-setreadonly-sets-contrast-incorrectly/7055

Also, I wonder if we should be changing contrast by halving the color
values (if they are signed color vals) rather than the transparency, in
keeping with the Python version. Transparency will be weird if the scale
is on a textured backgorund?
2019-04-10 17:36:21 +01:00
Alain Pitiot
becf79b5d6 version 3.0.6: various bug fixes and enhancements 2019-03-12 09:28:31 +01:00
Alain Pitiot
1512ecfdc9 various edits 2018-12-28 13:43:48 +01:00
Alain Pitiot
900f438516 version 3.0.0b13 2018-12-28 13:13:50 +01:00
Alain Pitiot
e09061f797 added MovieStim 2018-12-11 17:55:26 +01:00
Alain Pitiot
0f8e055542 _ 2018-12-10 07:56:29 +01:00
Alain Pitiot
10e2bc0650 added util module 2018-12-10 07:35:21 +01:00
Alain Pitiot
9c859abe65 small edits 2018-11-18 20:50:17 +01:00
Alain Pitiot
c7b881f5ef added API to README 2018-11-18 20:49:17 +01:00
Alain Pitiot
b245d5ac46 added jsdoc documentation 2018-11-18 20:37:05 +01:00
Alain Pitiot
14390697f1 fully documented the visual module; various bug fixes 2018-10-24 15:05:28 +02:00
Alain Pitiot
cc9a4202e9 various cosmetic changes 2018-10-08 17:07:15 +02:00
Alain Pitiot
965814fa90 updated license notices and readme 2018-10-08 16:56:51 +02:00