Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NF: Adds Slider for JS, and other amendments #2185

Merged
merged 10 commits into from Jan 11, 2019
Merged

NF: Adds Slider for JS, and other amendments #2185

merged 10 commits into from Jan 11, 2019

Commits on Dec 10, 2018

  1. WIP/NF: Adds JS code compiler for Slider - first pass.

    @dvbridges
    dvbridges committed Dec 10, 2018
    Copy the full SHA
    61d9eae View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. ENH: Further additions to Slider 

    Adds radio to Slider Builder Component
Removes default radio color as it overrides styles
Adds labelHeight param to Slider, to change label size
    @dvbridges
    dvbridges committed Dec 19, 2018
    Copy the full SHA
    a4cfd87 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'py2jsFix' of https://github.com/dvbridges/psychopy

    @dvbridges
    dvbridges committed Dec 19, 2018
    Copy the full SHA
    2d36693 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2018

  1. Merge branch 'master' of git://github.com/psychopy/psychopy

    @dvbridges
    dvbridges committed Dec 21, 2018
    Copy the full SHA
    2c746a9 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2019

  1. Merge branch 'master' of git://github.com/psychopy/psychopy

    @dvbridges
    dvbridges committed Jan 3, 2019
    Copy the full SHA
    000d6c1 View commit details
    Browse the repository at this point in the history

  2. Fix merge issue

    @dvbridges
    dvbridges committed Jan 3, 2019
    Copy the full SHA
    8d098a9 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2019

  1. ENH: Adds Slider for JS, and other amendments 

    Adds Slider code for JS
baseComponent now uses py2js to convert tuples to list
Adds new compile command for JS setFillColor
Updates version in settings.init
Other JS code compile amendments

Awaiting confirmation that server is running to test Slider online
    @dvbridges
    dvbridges committed Jan 4, 2019
    Copy the full SHA
    9c01362 View commit details
    Browse the repository at this point in the history

  2. BF: Remove unused variables carried over from Python code

    @dvbridges
    dvbridges committed Jan 4, 2019
    Copy the full SHA
    f3a101d View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2019

  1. BF: Uses PsychoPy version to format PsychJS import statements 

    Req made in this branch, as change to version already made using this branch, but change was specific to '3.0.0'.
Note, this will fail if user attempts to export HTML if using PsychoPY version < 3.0.0 (i.e., they used useVersion function/changed version in Experiment Settings). That should be ok though, considering they should not be using those versions for exporting HTML. Being able to select version 3.0.0 in the toolbar has been addressed in pull request psychopy#2180.
    @dvbridges
    dvbridges committed Jan 10, 2019
    Copy the full SHA
    1fcde5e View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2019

  1. BF: Removes venv files from pull request

    @dvbridges
    dvbridges committed Jan 11, 2019
    Copy the full SHA
    cf96eae View commit details
    Browse the repository at this point in the history