diff options
| author | John McLear <john@mclear.co.uk> | 2014-03-13 00:49:20 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2014-03-13 00:49:20 +0000 |
| commit | e12093eb196a1b61553d15ca434a24459f947f25 (patch) | |
| tree | f23d5ab85abb829a7943797047dc70ef98f126f1 /src | |
| parent | 96d06abac07af299307d7f993a79abfc7f2b7b92 (diff) | |
| parent | 7151e7827a52497ae4f8f08ae805d961b57ec4aa (diff) | |
| download | etherpad-lite-e12093eb196a1b61553d15ca434a24459f947f25.zip | |
Merge pull request #2080 from ether/ignore-ctrl-pageup
allow tabs to be cycled when focus is in editor
Diffstat (limited to 'src')
| -rw-r--r-- | src/static/js/ace2_inner.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index 6c4d9b4f..07a9b971 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -3750,7 +3750,7 @@ function Ace2Inner(){ specialHandled = true; } if((evt.which == 36 && evt.ctrlKey == true)){ setScrollY(0); } // Control Home send to Y = 0 - if((evt.which == 33 || evt.which == 34) && type == 'keydown'){ + if((evt.which == 33 || evt.which == 34) && type == 'keydown' && !evt.ctrlKey){ evt.preventDefault(); // This is required, browsers will try to do normal default behavior on page up / down and the default behavior SUCKS |