makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13018] Clean up and fix some logic.

Browse source 
PHPBB3-13018
This commit is contained in:
Cesar G 2014-09-15 07:44:02 -07:00
parent 2b4807b116
commit 4ae447b205
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -164,7 +164,7 @@ phpbb.alert.close = function($alert, fadedark) {
phpbb.confirm = function(msg, callback, fadedark) { phpbb.confirm = function(msg, callback, fadedark) {
var $confirmDiv = $('#phpbb_confirm'); var $confirmDiv = $('#phpbb_confirm');
$confirmDiv.find('.alert_text').html(msg); $confirmDiv.find('.alert_text').html(msg);
fadedark = (typeof fadedark === 'undefined') ? true : fadedark; fadedark = fadedark || true;
$(document).on('keydown.phpbb.alert', function(e) { $(document).on('keydown.phpbb.alert', function(e) {
if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) { if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) {
@ -177,14 +177,13 @@ phpbb.confirm = function(msg, callback, fadedark) {
}); });
$confirmDiv.find('input[type="button"]').one('click.phpbb.confirmbox', function(e) { $confirmDiv.find('input[type="button"]').one('click.phpbb.confirmbox', function(e) {
var confirmed = this.name === 'confirm', var confirmed = this.name === 'confirm';
fadedark = fadedark || !confirmed;
if (confirmed) { if (confirmed) {
callback(true); callback(true);
} }
$confirmDiv.find('input[type="button"]').off('click.phpbb.confirmbox'); $confirmDiv.find('input[type="button"]').off('click.phpbb.confirmbox');
phpbb.alert.close($confirmDiv, fadedark); phpbb.alert.close($confirmDiv, fadedark || !confirmed);
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();