diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-17 18:13:12 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-17 18:13:12 +0200 |
| commit | 82cf2392949f3cf29d995daee82db0f1f6b27f4c (patch) | |
| tree | 59a8612a7035ca80b98cdd937ab2744f8085c996 /phpBB/assets | |
| parent | 7ee3e3f73f2d602fd9eb0b67435aecb553c4b24d (diff) | |
| parent | e1b72c0b8637159cc598530440f6acd5fabc26a1 (diff) | |
| download | forums-82cf2392949f3cf29d995daee82db0f1f6b27f4c.tar forums-82cf2392949f3cf29d995daee82db0f1f6b27f4c.tar.gz forums-82cf2392949f3cf29d995daee82db0f1f6b27f4c.tar.bz2 forums-82cf2392949f3cf29d995daee82db0f1f6b27f4c.tar.xz forums-82cf2392949f3cf29d995daee82db0f1f6b27f4c.zip | |
Merge pull request #2610 from brunoais/ticket/12699
[Ticket/12699] Remove magic numbers in the message textarea keydown callback
* brunoais/ticket/12699:
[ticket/12699] Replace magic numbers for the TAB and for ENTER keydown
[ticket/12699] Add tab key to keymap
Diffstat (limited to 'phpBB/assets')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 37728864c4..80c44ec08f 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -7,6 +7,7 @@ phpbb.alertTime = 100; // define a couple constants for keydown functions. var keymap = { + TAB: 9, ENTER: 13, ESC: 27 }; @@ -1201,10 +1202,10 @@ phpbb.applyCodeEditor = function(textarea) { var key = event.keyCode || event.which; // intercept tabs - if (key == 9 && - !event.ctrlKey && - !event.shiftKey && - !event.altKey && + if (key == keymap.TAB && + !event.ctrlKey && + !event.shiftKey && + !event.altKey && !event.metaKey) { if (inTag()) { appendText("\t"); @@ -1214,7 +1215,7 @@ phpbb.applyCodeEditor = function(textarea) { } // intercept new line characters - if (key == 13) { + if (key == keymap.ENTER) { if (inTag()) { var lastLine = getLastLine(true), code = '' + /^\s*/g.exec(lastLine); |