aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets/javascript/core.js
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-06-09 03:04:45 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-06-09 03:04:45 +0200
commit14d0a5f66bce8ab400e274442816babc99e0c928 (patch)
tree3052c4302e6f32a476851d5855427fb699a8b986 /phpBB/assets/javascript/core.js
parent373918583dd1d8c271d34eed013f81181ee90e0b (diff)
parentf8a9eccb2aa3e458976ea6f45a4a78af718b120f (diff)
downloadforums-14d0a5f66bce8ab400e274442816babc99e0c928.tar
forums-14d0a5f66bce8ab400e274442816babc99e0c928.tar.gz
forums-14d0a5f66bce8ab400e274442816babc99e0c928.tar.bz2
forums-14d0a5f66bce8ab400e274442816babc99e0c928.tar.xz
forums-14d0a5f66bce8ab400e274442816babc99e0c928.zip
Merge pull request #2556 from brunoais/ticket/12672
[ticket/12672] Make tab intercept; CB for keypress only react without key mods * brunoais/ticket/12672: [ticket/12672] Make tab intercept; CB for keypress only react without key mods
Diffstat (limited to 'phpBB/assets/javascript/core.js')
-rw-r--r--phpBB/assets/javascript/core.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 296c5b0ef9..37728864c4 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -1201,7 +1201,11 @@ phpbb.applyCodeEditor = function(textarea) {
var key = event.keyCode || event.which;
// intercept tabs
- if (key == 9) {
+ if (key == 9 &&
+ !event.ctrlKey &&
+ !event.shiftKey &&
+ !event.altKey &&
+ !event.metaKey) {
if (inTag()) {
appendText("\t");
event.preventDefault();