1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 01:20:40 +01:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2017-11-01 16:08:46 +01:00
commit 91caee664a
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -175,7 +175,7 @@ phpbb.alert.close = function($alert, fadedark) {
phpbb.confirm = function(msg, callback, fadedark) {
var $confirmDiv = $('#phpbb_confirm');
$confirmDiv.find('.alert_text').html(msg);
fadedark = fadedark !== 'undefined' ? fadedark : true;
fadedark = typeof fadedark !== 'undefined' ? fadedark : true;
$(document).on('keydown.phpbb.alert', function(e) {
if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) {