mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-27 03:50:22 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/12699] Replace magic numbers for the TAB and for ENTER keydown
  [ticket/12699] Add tab key to keymap
This commit is contained in:
Andreas Fischer
2014-06-17 18:13:12 +02:00
parent 05d63e35ef 82cf239294
commit d89e384ec7
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/assets/javascript/core.js
View File

@@ -7,6 +7,7 @@ phpbb.alertTime = 100;
// define a couple constants for keydown functions. // define a couple constants for keydown functions.
var keymap = { var keymap = {
TAB: 9,
ENTER: 13, ENTER: 13,
ESC: 27 ESC: 27
}; };
@@ -1201,7 +1202,7 @@ phpbb.applyCodeEditor = function(textarea) {
var key = event.keyCode || event.which; var key = event.keyCode || event.which;
// intercept tabs // intercept tabs
if (key == 9 && if (key == keymap.TAB &&
!event.ctrlKey && !event.ctrlKey &&
!event.shiftKey && !event.shiftKey &&
!event.altKey && !event.altKey &&
@@ -1214,7 +1215,7 @@ phpbb.applyCodeEditor = function(textarea) {
} }
// intercept new line characters // intercept new line characters
if (key == 13) { if (key == keymap.ENTER) {
if (inTag()) { if (inTag()) {
var lastLine = getLastLine(true), var lastLine = getLastLine(true),
code = '' + /^\s*/g.exec(lastLine); code = '' + /^\s*/g.exec(lastLine);