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.

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

for using the free-sort plugin with a touch device. #1228

Merged
merged 4 commits into from Feb 19, 2021

Conversation

kurokida
Copy link
Contributor

@kurokida kurokida commented Nov 24, 2020

I noticed that the free-sort plugin is about to be improved.
In fact, I was also changing the plugin to use with a touch device.
Could you merge my pull request in addition to yours?

Note that when running the new example programs, the both the sort_area_height and sort_area_width properties need to be set to around 400 so that the images can be presented properly with a touch device.

@kurokida kurokida changed the title for using with a touch device. for using the free-sort plugin with a touch device. Nov 24, 2020
@becky-gilbert becky-gilbert deleted the branch jspsych:freesort November 25, 2020 17:48
@kurokida
Copy link
Contributor Author

Hi, @becky-gilbert ,

I'm not familiar with GitHub, so I'm not sure what I have to do.
Was there any problem?
Should I send a pull request to the master branch again?

@becky-gilbert
Copy link
Collaborator

@kurokida I'm so sorry, this was my mistake! I merged the jspsych:freesort branch into master and then deleted the branch, without realizing that this pull request was merging into it. Would you mind changing the base branch for this pull request to jspsych:master, if that's still possible?

@kurokida
Copy link
Contributor Author

@becky-gilbert , Thank you for your prompt reply.
No problem at all. I will send a new pull request to the master.

There is one thing I would like you to confirm.
As I mentioned in the notes, the current sample program has a problem when running in a touch device (at least in my iPhone).
I will try to solve this issue in the new pull request, so please check.

@becky-gilbert becky-gilbert reopened this Nov 26, 2020
@becky-gilbert
Copy link
Collaborator

@kurokida ok - no need to recreate the pull request because I was able to reopen this one. Sorry again about that! I think you should still be able to add more commits to this pull request, if necessary.

Thanks very much for sharing your improvements to this plugin! I'll have a look at your changes and see if/when @jodeleeuw wants to add this change to the library. And yes, I can also check that the example HTML file runs correctly on mobile phones.

@kurokida
Copy link
Contributor Author

Thanks again @becky-gilbert for reopening this request!
I added a new commit regarding the demo to my branch.
But, I don't know how to change the target branch. So, this request is still targeted to the jspsych:freesort not the master.
Please let me know if there is anything I should do.

@becky-gilbert
Copy link
Collaborator

@kurokida no problem, I recreated the jspsych:freesort branch so that you don't need to change the pull request. This way we can still merge your changes into jspsych:freesort, and then merge that into jspsych:master. So there's nothing else you need to do! 👍

I'll have a look at your changes and get back to you ASAP. Thanks again!

@jodeleeuw jodeleeuw added this to the 7.0 milestone Dec 3, 2020
@jodeleeuw jodeleeuw added this to To do in 6.3 Dec 23, 2020
@becky-gilbert becky-gilbert modified the milestones: 7.0, 6.3 Jan 5, 2021
@becky-gilbert becky-gilbert self-assigned this Jan 26, 2021
@becky-gilbert
Copy link
Collaborator

I'm now merging this into the jsPsych freesort branch so that I can take a look at it, and if everything looks good then I'll merge the jsPsych freesort branch into master.

@becky-gilbert becky-gilbert merged commit bb7b3f0 into jspsych:freesort Feb 19, 2021
6.3 automation moved this from To do to Done Feb 19, 2021
becky-gilbert added a commit that referenced this pull request Feb 19, 2021
Merge freesort touchscreen updates from #1228
@becky-gilbert becky-gilbert mentioned this pull request Feb 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
6.3
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants