makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 09:48:53 +00:00
Code Issues Projects Releases Packages 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
commit d89e384ec7
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/assets/javascript/core.js
View file

@ -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);