mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314

Browse Source 
Conflicts:
	phpBB/styles/prosilver/template/timezone.js
This commit is contained in:
Marc Alexander
2013-03-26 13:18:54 +01:00
parent f0b0978538 8b464e87f0
commit 34cdbd0360
213 changed files with 15880 additions and 2836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -308,8 +308,8 @@ phpbb.ajaxify = function(options) {
}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
}
} else {
// If confirmation is required, display a diologue to the user.
phpbb.confirm(res.MESSAGE_TEXT, function(del) {
// If confirmation is required, display a dialog to the user.
phpbb.confirm(res.MESSAGE_BODY, function(del) {
if (del) {
phpbb.loadingAlert();
data = $('<form>' + res.S_HIDDEN_FIELDS + '</form>').serialize();
@@ -489,6 +489,19 @@ phpbb.timezonePreselectSelect = function(forceSelector) {
}
};
// Toggle notification list
$('#notification_list_button').click(function(e) {
$('#notification_list').toggle();
e.preventDefault();
});
$('#phpbb').click(function(e) {
var target = $(e.target);
if (!target.is('#notification_list') && !target.is('#notification_list_button') && !target.parents().is('#notification_list')) {
$('#notification_list').hide();
}
});
phpbb.ajaxCallbacks = {};
/**