mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 15:45:34 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'callumacrae/ticket/10949' into ticket/10949

Browse Source 
Conflicts:
	phpBB/assets/javascript/core.js
This commit is contained in:
Marc Alexander 2013-01-04 20:46:56 +01:00
commit 46c33e08b5
2 changed files with 84 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
var phpbb = {}; var phpbb = {};
phpbb.alert_time = 100; phpbb.alertTime = 100;
(function($) { // Avoid conflicts with other libraries (function($) { // Avoid conflicts with other libraries
@ -12,36 +12,32 @@ var keymap = {
}; };
var dark = $('#darkenwrapper'); var dark = $('#darkenwrapper');
var loading_alert = $('#loadingalert'); var loadingAlert = $('#loadingalert');
var phpbbAlertTimer = null; var phpbbAlertTimer = null;
/** /**
* Display a loading screen. * Display a loading screen
* *
* @returns object Returns loading_alert. * @returns object Returns loadingAlert.
*/ */
phpbb.loading_alert = function() { phpbb.loadingAlert = function() {
if (dark.is(':visible')) if (dark.is(':visible')) {
{ loadingAlert.fadeIn(phpbb.alertTime);
loading_alert.fadeIn(phpbb.alert_time); } else {
} loadingAlert.show();
else dark.fadeIn(phpbb.alertTime, function() {
{
loading_alert.show();
dark.fadeIn(phpbb.alert_time, function() {
// Wait five seconds and display an error if nothing has been returned by then. // Wait five seconds and display an error if nothing has been returned by then.
phpbbAlertTimer = setTimeout(function() { phpbbAlertTimer = setTimeout(function() {
if (loading_alert.is(':visible')) if (loadingAlert.is(':visible')) {
{
phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req')); phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req'));
} }
}, 5000); }, 5000);
}); });
} }
return loading_alert; return loadingAlert;
} };
/** /**
* Clear loading alert timeout * Clear loading alert timeout
@ -78,7 +74,7 @@ phpbb.alert = function(title, msg, fadedark) {
div.find('.alert_close').unbind('click'); div.find('.alert_close').unbind('click');
fade = (typeof fadedark !== 'undefined' && !fadedark) ? div : dark; fade = (typeof fadedark !== 'undefined' && !fadedark) ? div : dark;
fade.fadeOut(phpbb.alert_time, function() { fade.fadeOut(phpbb.alertTime, function() {
div.hide(); div.hide();
}); });
@ -101,27 +97,22 @@ phpbb.alert = function(title, msg, fadedark) {
e.preventDefault(); e.preventDefault();
}); });
if (loading_alert.is(':visible')) if (loadingAlert.is(':visible')) {
{ loadingAlert.fadeOut(phpbb.alertTime, function() {
loading_alert.fadeOut(phpbb.alert_time, function() {
dark.append(div); dark.append(div);
div.fadeIn(phpbb.alert_time); div.fadeIn(phpbb.alertTime);
}); });
} } else if (dark.is(':visible')) {
else if (dark.is(':visible'))
{
dark.append(div); dark.append(div);
div.fadeIn(phpbb.alert_time); div.fadeIn(phpbb.alertTime);
} } else {
else
{
dark.append(div); dark.append(div);
div.show(); div.show();
dark.fadeIn(phpbb.alert_time); dark.fadeIn(phpbb.alertTime);
} }
return div; return div;
} };
/** /**
* Display a simple yes / no box to the user. * Display a simple yes / no box to the user.
@ -147,7 +138,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
var click_handler = function(e) { var click_handler = function(e) {
var res = this.className === 'button1'; var res = this.className === 'button1';
var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark; var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark;
fade.fadeOut(phpbb.alert_time, function() { fade.fadeOut(phpbb.alertTime, function() {
div.hide(); div.hide();
}); });
div.find('input[type="button"]').unbind('click', click_handler); div.find('input[type="button"]').unbind('click', click_handler);
@ -162,7 +153,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
dark.one('click', function(e) { dark.one('click', function(e) {
div.find('.alert_close').unbind('click'); div.find('.alert_close').unbind('click');
dark.fadeOut(phpbb.alert_time, function() { dark.fadeOut(phpbb.alertTime, function() {
div.hide(); div.hide();
}); });
callback(false); callback(false);
@ -185,7 +176,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
div.find('.alert_close').one('click', function(e) { div.find('.alert_close').one('click', function(e) {
var fade = (typeof fadedark !== 'undefined' && fadedark) ? div : dark; var fade = (typeof fadedark !== 'undefined' && fadedark) ? div : dark;
fade.fadeOut(phpbb.alert_time, function() { fade.fadeOut(phpbb.alertTime, function() {
div.hide(); div.hide();
}); });
callback(false); callback(false);
@ -193,27 +184,22 @@ phpbb.confirm = function(msg, callback, fadedark) {
e.preventDefault(); e.preventDefault();
}); });
if (loading_alert.is(':visible')) if (loadingAlert.is(':visible')) {
{ loadingAlert.fadeOut(phpbb.alertTime, function() {
loading_alert.fadeOut(phpbb.alert_time, function() {
dark.append(div); dark.append(div);
div.fadeIn(phpbb.alert_time); div.fadeIn(phpbb.alertTime);
}); });
} } else if (dark.is(':visible')) {
else if (dark.is(':visible'))
{
dark.append(div); dark.append(div);
div.fadeIn(phpbb.alert_time); div.fadeIn(phpbb.alertTime);
} } else {
else
{
dark.append(div); dark.append(div);
div.show(); div.show();
dark.fadeIn(phpbb.alert_time); dark.fadeIn(phpbb.alertTime);
} }
return div; return div;
} };
/** /**
* Turn a querystring into an array. * Turn a querystring into an array.
@ -225,13 +211,12 @@ phpbb.parse_querystring = function(string) {
var params = {}, i, split; var params = {}, i, split;
string = string.split('&'); string = string.split('&');
for (i = 0; i < string.length; i++) for (i = 0; i < string.length; i++) {
{
split = string[i].split('='); split = string[i].split('=');
params[split[0]] = decodeURIComponent(split[1]); params[split[0]] = decodeURIComponent(split[1]);
} }
return params; return params;
} };
/** /**
@ -257,14 +242,13 @@ phpbb.ajaxify = function(options) {
refresh = options.refresh, refresh = options.refresh,
callback = options.callback, callback = options.callback,
overlay = (typeof options.overlay !== 'undefined') ? options.overlay : true, overlay = (typeof options.overlay !== 'undefined') ? options.overlay : true,
is_form = elements.is('form'), isForm = elements.is('form'),
event_name = is_form ? 'submit' : 'click'; eventName = isForm ? 'submit' : 'click';
elements.bind(event_name, function(event) { elements.bind(eventName, function(event) {
var action, method, data, submit, that = this, $this = $(this); var action, method, data, submit, that = this, $this = $(this);
if ($this.find('input[type="submit"][data-clicked]').attr('data-ajax') === 'false') if ($this.find('input[type="submit"][data-clicked]').attr('data-ajax') === 'false') {
{
return; return;
} }
@ -278,80 +262,65 @@ phpbb.ajaxify = function(options) {
* *
* @param object res The object sent back by the server. * @param object res The object sent back by the server.
*/ */
function return_handler(res) function returnHandler(res) {
{
var alert; var alert;
phpbb.clearLoadingTimeout(); phpbb.clearLoadingTimeout();
// Is a confirmation required? // Is a confirmation required?
if (typeof res.S_CONFIRM_ACTION === 'undefined') if (typeof res.S_CONFIRM_ACTION === 'undefined') {
{
// If a confirmation is not required, display an alert and call the // If a confirmation is not required, display an alert and call the
// callbacks. // callbacks.
if (typeof res.MESSAGE_TITLE !== 'undefined') if (typeof res.MESSAGE_TITLE !== 'undefined') {
{
alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT); alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
} } else {
else dark.fadeOut(phpbb.alertTime);
{
dark.fadeOut(phpbb.alert_time);
} }
if (typeof phpbb.ajax_callbacks[callback] === 'function') if (typeof phpbb.ajaxCallbacks[callback] === 'function') {
{ phpbb.ajaxCallbacks[callback].call(that, res);
phpbb.ajax_callbacks[callback].call(that, res);
} }
// If the server says to refresh the page, check whether the page should // If the server says to refresh the page, check whether the page should
// be refreshed and refresh page after specified time if required. // be refreshed and refresh page after specified time if required.
if (res.REFRESH_DATA) if (res.REFRESH_DATA) {
{ if (typeof refresh === 'function') {
if (typeof refresh === 'function')
{
refresh = refresh(res.REFRESH_DATA.url); refresh = refresh(res.REFRESH_DATA.url);
} } else if (typeof refresh !== 'boolean') {
else if (typeof refresh !== 'boolean')
{
refresh = false; refresh = false;
} }
setTimeout(function() { setTimeout(function() {
if (refresh) if (refresh) {
{
window.location = res.REFRESH_DATA.url; window.location = res.REFRESH_DATA.url;
} }
// Hide the alert even if we refresh the page, in case the user // Hide the alert even if we refresh the page, in case the user
// presses the back button. // presses the back button.
dark.fadeOut(phpbb.alert_time, function() { dark.fadeOut(phpbb.alertTime, function() {
alert.hide(); alert.hide();
}); });
}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds }, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
} }
} } else {
else
{
// If confirmation is required, display a diologue to the user. // If confirmation is required, display a diologue to the user.
phpbb.confirm(res.MESSAGE_TEXT, function(del) { phpbb.confirm(res.MESSAGE_TEXT, function(del) {
if (del) if (del) {
{ phpbb.loadingAlert();
phpbb.loading_alert();
data = $('<form>' + res.S_HIDDEN_FIELDS + '</form>').serialize(); data = $('<form>' + res.S_HIDDEN_FIELDS + '</form>').serialize();
$.ajax({ $.ajax({
url: res.S_CONFIRM_ACTION, url: res.S_CONFIRM_ACTION,
type: 'POST', type: 'POST',
data: data + '&confirm=' + res.YES_VALUE, data: data + '&confirm=' + res.YES_VALUE,
success: return_handler, success: returnHandler,
error: error_handler error: errorHandler
}); });
} }
}, false); }, false);
} }
} }
function error_handler() function errorHandler() {
{
var alert; var alert;
phpbb.clearLoadingTimeout(); phpbb.clearLoadingTimeout();
@ -360,25 +329,21 @@ phpbb.ajaxify = function(options) {
// If the element is a form, POST must be used and some extra data must // If the element is a form, POST must be used and some extra data must
// be taken from the form. // be taken from the form.
var run_filter = (typeof options.filter === 'function'); var runFilter = (typeof options.filter === 'function');
if (is_form) if (isForm) {
{
action = $this.attr('action').replace('&amp;', '&'); action = $this.attr('action').replace('&amp;', '&');
data = $this.serializeArray(); data = $this.serializeArray();
method = $this.attr('method') || 'GET'; method = $this.attr('method') || 'GET';
if ($this.find('input[type="submit"][data-clicked]')) if ($this.find('input[type="submit"][data-clicked]')) {
{
submit = $this.find('input[type="submit"][data-clicked]'); submit = $this.find('input[type="submit"][data-clicked]');
data.push({ data.push({
name: submit.attr('name'), name: submit.attr('name'),
value: submit.val() value: submit.val()
}); });
} }
} } else {
else
{
action = this.href; action = this.href;
data = null; data = null;
method = 'GET'; method = 'GET';
@ -386,28 +351,27 @@ phpbb.ajaxify = function(options) {
// If filter function returns false, cancel the AJAX functionality, // If filter function returns false, cancel the AJAX functionality,
// and return true (meaning that the HTTP request will be sent normally). // and return true (meaning that the HTTP request will be sent normally).
if (run_filter && !options.filter.call(this, data)) if (runFilter && !options.filter.call(this, data)) {
{
return; return;
} }
if (overlay && (typeof $this.attr('data-overlay') === 'undefined' || $this.attr('data-overlay') == 'true')) if (overlay && (typeof $this.attr('data-overlay') === 'undefined' || $this.attr('data-overlay') == 'true'))
{ {
phpbb.loading_alert(); phpbb.loadingAlert();
} }
$.ajax({ $.ajax({
url: action, url: action,
type: method, type: method,
data: data, data: data,
success: return_handler, success: returnHandler,
error: error_handler error: errorHandler
}); });
event.preventDefault(); event.preventDefault();
}); });
if (is_form) { if (isForm) {
elements.find('input:submit').click(function () { elements.find('input:submit').click(function () {
var $this = $(this); var $this = $(this);
@ -417,7 +381,7 @@ phpbb.ajaxify = function(options) {
} }
return this; return this;
} };
/** /**
* Hide the optgroups that are not the selected timezone * Hide the optgroups that are not the selected timezone
@ -528,7 +492,7 @@ phpbb.timezone_preselect_select = function(force_selector) {
} }
} }
phpbb.ajax_callbacks = {}; phpbb.ajaxCallbacks = {};
/** /**
* Adds an AJAX callback to be used by phpbb.ajaxify. * Adds an AJAX callback to be used by phpbb.ajaxify.
@ -538,14 +502,12 @@ phpbb.ajax_callbacks = {};
* @param string id The name of the callback. * @param string id The name of the callback.
* @param function callback The callback to be called. * @param function callback The callback to be called.
*/ */
phpbb.add_ajax_callback = function(id, callback) phpbb.add_ajax_callback = function(id, callback) {
{ if (typeof callback === 'function') {
if (typeof callback === 'function') phpbb.ajaxCallbacks[id] = callback;
{
phpbb.ajax_callbacks[id] = callback;
} }
return this; return this;
} };
/** /**
@ -555,12 +517,12 @@ phpbb.add_ajax_callback = function(id, callback)
*/ */
phpbb.add_ajax_callback('alt_text', function() { phpbb.add_ajax_callback('alt_text', function() {
var el = $(this), var el = $(this),
alt_text; altText;
alt_text = el.attr('data-alt-text'); altText = el.attr('data-alt-text');
el.attr('data-alt-text', el.text()); el.attr('data-alt-text', el.text());
el.attr('title', alt_text); el.attr('title', altText);
el.text(alt_text); eel.text(altText);
}); });
/** /**

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

@ -93,14 +93,12 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
// This callback finds the post from the delete link, and removes it. // This callback finds the post from the delete link, and removes it.
phpbb.add_ajax_callback('post_delete', function() { phpbb.add_ajax_callback('post_delete', function() {
var el = $(this), var el = $(this),
post_id; postId;
if (el.attr('data-refresh') === undefined) if (el.attr('data-refresh') === undefined) {
{ postId = el[0].href.split('&p=')[1];
post_id = el[0].href.split('&p=')[1]; var post = el.parents('#p' + postId).css('pointer-events', 'none');
var post = el.parents('#p' + post_id).css('pointer-events', 'none'); if (post.hasClass('bg1') || post.hasClass('bg2')) {
if (post.hasClass('bg1') || post.hasClass('bg2'))
{
var posts1 = post.nextAll('.bg1'); var posts1 = post.nextAll('.bg1');
post.nextAll('.bg2').removeClass('bg2').addClass('bg1'); post.nextAll('.bg2').removeClass('bg2').addClass('bg1');
posts1.removeClass('bg1').addClass('bg2'); posts1.removeClass('bg1').addClass('bg2');
@ -142,8 +140,7 @@ $('[data-ajax]').each(function() {
ajax = $this.attr('data-ajax'), ajax = $this.attr('data-ajax'),
fn; fn;
if (ajax !== 'false') if (ajax !== 'false') {
{
fn = (ajax !== 'true') ? ajax : null; fn = (ajax !== 'true') ? ajax : null;
phpbb.ajaxify({ phpbb.ajaxify({
selector: this, selector: this,
@ -177,12 +174,9 @@ phpbb.ajaxify({
filter: function (data) { filter: function (data) {
var action = $('#quick-mod-select').val(); var action = $('#quick-mod-select').val();
if (action === 'make_normal') if (action === 'make_normal') {
{
return $(this).find('select option[value="make_global"]').length > 0; return $(this).find('select option[value="make_global"]').length > 0;
} } else if (action === 'lock' || action === 'unlock') {
else if (action === 'lock' || action === 'unlock')
{
return true; return true;
} }