mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-20 08:31:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/12843] Fix Mark forums read browser console error
This commit is contained in:
Joas Schilling
2014-07-27 19:51:47 +02:00
parent 09d00afcc3 e94f24c821
commit 82d9803aa8
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,18 @@ phpbb.clearLoadingTimeout = function() {
}
};
/**
* Close popup alert after a specified delay
*
* @param int Delay in ms until darkenwrapper's click event is triggered
*/
phpbb.closeDarkenWrapper = function(delay) {
phpbbAlertTimer = setTimeout(function() {
$('#darkenwrapper').trigger('click');
}, delay);
};
/**
* Display a simple alert similar to JSs native alert().
*

11
phpBB/styles/prosilver/template/ajax.js
View File

@@ -2,17 +2,6 @@
"use strict";
/**
* Close popup alert after a specified delay
*
* @param int Delay in ms until darkenwrapper's click event is triggered
*/
phpbb.closeDarkenWrapper = function(delay) {
phpbbAlertTimer = setTimeout(function() {
$('#darkenwrapper').trigger('click');
}, delay);
};
// This callback will mark all forum icons read
phpbb.addAjaxCallback('mark_forums_read', function(res) {
var readTitle = res.NO_UNREAD_POSTS;