Skip to content

Commit 46d5808

Browse files
committed
Fix navigation between confirmation inputs
1 parent 01f6a19 commit 46d5808

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

web/media/keyhandler.js

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,28 @@
11
function checkForEnter(event) {
2-
switch (event.keyCode) {
3-
// up arrow
4-
case 40:
2+
switch (event.originalEvent.key) {
3+
case "ArrowUp":
54
$(this)
65
.parent()
76
.parent()
8-
.next()
7+
.prev()
98
.children("td")
109
.children("input[class=" + $(this).attr("class") + "]")
1110
.focus()
1211
.select();
1312
break;
1413

15-
// down arrow
16-
case 38:
14+
case "ArrowDown":
1715
$(this)
1816
.parent()
1917
.parent()
20-
.prev()
18+
.next()
2119
.children("td")
2220
.children("input[class=" + $(this).attr("class") + "]")
2321
.focus()
2422
.select();
2523
break;
2624

27-
// Enter key
28-
case 13:
25+
case "Enter":
2926
$(this)
3027
.parent()
3128
.parent()
@@ -35,7 +32,5 @@ function checkForEnter(event) {
3532
.focus()
3633
.select();
3734
event.preventDefault();
38-
return false;
39-
break;
4035
}
4136
}

web/templates/tupa/syota_tehtava.html

+1-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@
2323
$(document).ready(function(){
2424
$("#taulukko").stickyTableHeaders();
2525

26-
if ($.browser.mozilla) {
27-
$("input").keypress(checkForEnter);
28-
} else {
29-
$("input").keydown(checkForEnter);
30-
}
26+
$("input").keydown(checkForEnter);
3127

3228
jQuery(function($){
3329
$.mask.definitions['~']='[he0123456789]'; /* hylätty, ei syötetty, numeroarvot*/

web/tupa/views.py

+5
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,11 @@ def syotaTehtava(request, kisa_nimi, tehtava_id, talletettu=None, tarkistus=None
534534
else:
535535
formi.fields["arvo"].widget.attrs["class"] += " col" + str(colnum)
536536

537+
if "class" not in formi.fields["tarkistus"].widget.attrs.keys():
538+
formi.fields["tarkistus"].widget.attrs["class"] = "col" + str(colnum)
539+
else:
540+
formi.fields["tarkistus"].widget.attrs["class"] += " col" + str(colnum)
541+
537542
if formi.is_valid(): # Talletetaan syöte
538543
formi.save()
539544
else:

0 commit comments

Comments
 (0)