From 2c70cec4fb641fa2f6e7d37be706e38e2697939b Mon Sep 17 00:00:00 2001 From: brunoais Date: Fri, 13 Jun 2014 12:08:03 +0100 Subject: [PATCH 1/2] [ticket/12699] Add tab key to keymap PHPBB3-12699 --- phpBB/assets/javascript/core.js | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 37728864c4..a70e6b3e9a 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 }; From e1b72c0b8637159cc598530440f6acd5fabc26a1 Mon Sep 17 00:00:00 2001 From: brunoais Date: Fri, 13 Jun 2014 12:10:38 +0100 Subject: [PATCH 2/2] [ticket/12699] Replace magic numbers for the TAB and for ENTER keydown Replaced the magic numbers 9 and 13 in the keydown for the text editor with constants in the existing keymap for phpBB. PHPBB3-12699 --- phpBB/assets/javascript/core.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index a70e6b3e9a..80c44ec08f 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -1202,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"); @@ -1215,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);