Skip to content

Stop using middle button to launch partition #516

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

Merged
merged 2 commits into from
Mar 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .ci-macosx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ rm -f /usr/local/bin/idle3.11
rm -f /usr/local/bin/pydoc3.11
rm -f /usr/local/bin/python3.11
rm -f /usr/local/bin/python3.11-config
rm -f /usr/local/lib/libtcl8.6.dylib
rm -f /usr/local/lib/libtk8.6.dylib
brew upgrade

brew install pkg-config
Expand Down
2 changes: 1 addition & 1 deletion docs/howto-classify-students-answers.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Follow these steps:

1. Go to the teaching tab in the LearnOCaml Web UI (needs a teacher token).

2. Middle-click on the exercise `x` in the list of exercises.
2. Hold Ctrl (on macOS: Hold ⌘) and left click on the exercise `x` in the list of exercises.

3. Enter `foo` in the dialog box.

Expand Down
8 changes: 7 additions & 1 deletion src/app/learnocaml_teacher_tab.ml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,13 @@ let rec teacher_tab token _select _params () =
H.a_ondblclick (fun _ -> open_exercise_ ());
H.a_onmouseup (fun ev ->
Js.Optdef.case ev##.which (fun () -> true) @@ fun btn ->
if btn = Dom_html.Middle_button then open_partition_ () else true);
if (Js.to_bool ev##.ctrlKey ||
Js.to_bool ev##.metaKey (* ⌘ on macOS *))
&& btn = Dom_html.Left_button
then
open_partition_ ()
else
true);
] [
auto_checkbox_td ();
H.td ~a:[indent_style group_level]
Expand Down