Showing the changes to player/javascript (1 of 1 file). Show all
Unified · Split
| @@ -311,6 +311,7 @@ function add_binding(forced, key, name, fn, opts) { · 310 unmodified lines | |||
| 311 | fn({ | 311 | fn({ |
| 312 | event: KEY_STATES[state[0]] || "unknown", | 312 | event: KEY_STATES[state[0]] || "unknown", |
| 313 | is_mouse: state[1] == "m", | 313 | is_mouse: state[1] == "m", |
| 314 | canceled: state[2] == "c", | ||
| 314 | key_name: key_name || undefined, | 315 | key_name: key_name || undefined, |
| 315 | key_text: key_text || undefined | 316 | key_text: key_text || undefined |
| 316 | }); | 317 | }); |
| @@ -321,7 +322,10 @@ function add_binding(forced, key, name, fn, opts) { · 4 unmodified lines | |||
| 321 | // Emulate the semantics at input.c: mouse emits on up, kb on down. | 322 | // Emulate the semantics at input.c: mouse emits on up, kb on down. |
| 322 | // Also, key repeat triggers the binding again. | 323 | // Also, key repeat triggers the binding again. |
| 323 | var e = state[0], | 324 | var e = state[0], |
| 324 | emit = (state[1] == "m") ? (e == "u") : (e == "d"); | 325 | emit = (state[1] == "m") ? (e == "u") : (e == "d"), |
| 326 | canceled = state[2] == "c"; | ||
| 327 | if (canceled) | ||
| 328 | return; | ||
| 325 | if (emit || e == "p" || e == "r" && key_data.repeatable) | 329 | if (emit || e == "p" || e == "r" && key_data.repeatable) |
| 326 | fn(); | 330 | fn(); |
| 327 | } | 331 | } |