aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-01-04 20:46:56 +0100
committerMarc Alexander <admin@m-a-styles.de>2013-01-04 20:46:56 +0100
commit46c33e08b5d46c5aafe963298367bd61cbadc5fd (patch)
treef149262c972668c8cfe8332f9b8f9186f7bdb59a /phpBB/assets
parent228580b6743b9650996284dd04a3f5de6c2447ca (diff)
parentd5a788ae5b615c1b6b642c631884a4d936be2a4c (diff)
downloadforums-46c33e08b5d46c5aafe963298367bd61cbadc5fd.tar
forums-46c33e08b5d46c5aafe963298367bd61cbadc5fd.tar.gz
forums-46c33e08b5d46c5aafe963298367bd61cbadc5fd.tar.bz2
forums-46c33e08b5d46c5aafe963298367bd61cbadc5fd.tar.xz
forums-46c33e08b5d46c5aafe963298367bd61cbadc5fd.zip
Merge remote-tracking branch 'callumacrae/ticket/10949' into ticket/10949
Conflicts: phpBB/assets/javascript/core.js
Diffstat (limited to 'phpBB/assets')
-rw-r--r--phpBB/assets/javascript/core.js190
1 files changed, 76 insertions, 114 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 30c0a199bf..421d6a12dc 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -1,5 +1,5 @@
var phpbb = {};
-phpbb.alert_time = 100;
+phpbb.alertTime = 100;
(function($) { // Avoid conflicts with other libraries
@@ -12,36 +12,32 @@ var keymap = {
};
var dark = $('#darkenwrapper');
-var loading_alert = $('#loadingalert');
+var loadingAlert = $('#loadingalert');
var phpbbAlertTimer = null;
/**
- * Display a loading screen.
+ * Display a loading screen
*
- * @returns object Returns loading_alert.
+ * @returns object Returns loadingAlert.
*/
-phpbb.loading_alert = function() {
- if (dark.is(':visible'))
- {
- loading_alert.fadeIn(phpbb.alert_time);
- }
- else
- {
- loading_alert.show();
- dark.fadeIn(phpbb.alert_time, function() {
+phpbb.loadingAlert = function() {
+ if (dark.is(':visible')) {
+ loadingAlert.fadeIn(phpbb.alertTime);
+ } else {
+ loadingAlert.show();
+ dark.fadeIn(phpbb.alertTime, function() {
// Wait five seconds and display an error if nothing has been returned by then.
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'));
}
}, 5000);
});
}
- return loading_alert;
-}
+ return loadingAlert;
+};
/**
* Clear loading alert timeout
@@ -78,7 +74,7 @@ phpbb.alert = function(title, msg, fadedark) {
div.find('.alert_close').unbind('click');
fade = (typeof fadedark !== 'undefined' && !fadedark) ? div : dark;
- fade.fadeOut(phpbb.alert_time, function() {
+ fade.fadeOut(phpbb.alertTime, function() {
div.hide();
});
@@ -101,27 +97,22 @@ phpbb.alert = function(title, msg, fadedark) {
e.preventDefault();
});
- if (loading_alert.is(':visible'))
- {
- loading_alert.fadeOut(phpbb.alert_time, function() {
+ if (loadingAlert.is(':visible')) {
+ loadingAlert.fadeOut(phpbb.alertTime, function() {
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);
- div.fadeIn(phpbb.alert_time);
- }
- else
- {
+ div.fadeIn(phpbb.alertTime);
+ } else {
dark.append(div);
div.show();
- dark.fadeIn(phpbb.alert_time);
+ dark.fadeIn(phpbb.alertTime);
}
return div;
-}
+};
/**
* 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 res = this.className === 'button1';
var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark;
- fade.fadeOut(phpbb.alert_time, function() {
+ fade.fadeOut(phpbb.alertTime, function() {
div.hide();
});
div.find('input[type="button"]').unbind('click', click_handler);
@@ -162,7 +153,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
dark.one('click', function(e) {
div.find('.alert_close').unbind('click');
- dark.fadeOut(phpbb.alert_time, function() {
+ dark.fadeOut(phpbb.alertTime, function() {
div.hide();
});
callback(false);
@@ -185,7 +176,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
div.find('.alert_close').one('click', function(e) {
var fade = (typeof fadedark !== 'undefined' && fadedark) ? div : dark;
- fade.fadeOut(phpbb.alert_time, function() {
+ fade.fadeOut(phpbb.alertTime, function() {
div.hide();
});
callback(false);
@@ -193,27 +184,22 @@ phpbb.confirm = function(msg, callback, fadedark) {
e.preventDefault();
});
- if (loading_alert.is(':visible'))
- {
- loading_alert.fadeOut(phpbb.alert_time, function() {
+ if (loadingAlert.is(':visible')) {
+ loadingAlert.fadeOut(phpbb.alertTime, function() {
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);
- div.fadeIn(phpbb.alert_time);
- }
- else
- {
+ div.fadeIn(phpbb.alertTime);
+ } else {
dark.append(div);
div.show();
- dark.fadeIn(phpbb.alert_time);
+ dark.fadeIn(phpbb.alertTime);
}
return div;
-}
+};
/**
* Turn a querystring into an array.
@@ -225,13 +211,12 @@ phpbb.parse_querystring = function(string) {
var params = {}, i, split;
string = string.split('&');
- for (i = 0; i < string.length; i++)
- {
+ for (i = 0; i < string.length; i++) {
split = string[i].split('=');
params[split[0]] = decodeURIComponent(split[1]);
}
return params;
-}
+};
/**
@@ -257,14 +242,13 @@ phpbb.ajaxify = function(options) {
refresh = options.refresh,
callback = options.callback,
overlay = (typeof options.overlay !== 'undefined') ? options.overlay : true,
- is_form = elements.is('form'),
- event_name = is_form ? 'submit' : 'click';
+ isForm = elements.is('form'),
+ eventName = isForm ? 'submit' : 'click';
- elements.bind(event_name, function(event) {
+ elements.bind(eventName, function(event) {
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;
}
@@ -278,80 +262,65 @@ phpbb.ajaxify = function(options) {
*
* @param object res The object sent back by the server.
*/
- function return_handler(res)
- {
+ function returnHandler(res) {
var alert;
phpbb.clearLoadingTimeout();
// 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
// callbacks.
- if (typeof res.MESSAGE_TITLE !== 'undefined')
- {
+ if (typeof res.MESSAGE_TITLE !== 'undefined') {
alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
- }
- else
- {
- dark.fadeOut(phpbb.alert_time);
+ } else {
+ dark.fadeOut(phpbb.alertTime);
}
- if (typeof phpbb.ajax_callbacks[callback] === 'function')
- {
- phpbb.ajax_callbacks[callback].call(that, res);
+ if (typeof phpbb.ajaxCallbacks[callback] === 'function') {
+ phpbb.ajaxCallbacks[callback].call(that, res);
}
// If the server says to refresh the page, check whether the page should
// be refreshed and refresh page after specified time if required.
- if (res.REFRESH_DATA)
- {
- if (typeof refresh === 'function')
- {
+ if (res.REFRESH_DATA) {
+ if (typeof refresh === 'function') {
refresh = refresh(res.REFRESH_DATA.url);
- }
- else if (typeof refresh !== 'boolean')
- {
+ } else if (typeof refresh !== 'boolean') {
refresh = false;
}
setTimeout(function() {
- if (refresh)
- {
+ if (refresh) {
window.location = res.REFRESH_DATA.url;
}
// Hide the alert even if we refresh the page, in case the user
// presses the back button.
- dark.fadeOut(phpbb.alert_time, function() {
+ dark.fadeOut(phpbb.alertTime, function() {
alert.hide();
});
}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
}
- }
- else
- {
+ } else {
// If confirmation is required, display a diologue to the user.
phpbb.confirm(res.MESSAGE_TEXT, function(del) {
- if (del)
- {
- phpbb.loading_alert();
+ if (del) {
+ phpbb.loadingAlert();
data = $('<form>' + res.S_HIDDEN_FIELDS + '</form>').serialize();
$.ajax({
url: res.S_CONFIRM_ACTION,
type: 'POST',
data: data + '&confirm=' + res.YES_VALUE,
- success: return_handler,
- error: error_handler
+ success: returnHandler,
+ error: errorHandler
});
}
}, false);
}
}
- function error_handler()
- {
+ function errorHandler() {
var alert;
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
// 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;', '&');
data = $this.serializeArray();
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]');
data.push({
name: submit.attr('name'),
value: submit.val()
});
}
- }
- else
- {
+ } else {
action = this.href;
data = null;
method = 'GET';
@@ -386,28 +351,27 @@ phpbb.ajaxify = function(options) {
// If filter function returns false, cancel the AJAX functionality,
// 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;
}
if (overlay && (typeof $this.attr('data-overlay') === 'undefined' || $this.attr('data-overlay') == 'true'))
{
- phpbb.loading_alert();
+ phpbb.loadingAlert();
}
$.ajax({
url: action,
type: method,
data: data,
- success: return_handler,
- error: error_handler
+ success: returnHandler,
+ error: errorHandler
});
event.preventDefault();
});
- if (is_form) {
+ if (isForm) {
elements.find('input:submit').click(function () {
var $this = $(this);
@@ -417,7 +381,7 @@ phpbb.ajaxify = function(options) {
}
return this;
-}
+};
/**
* 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.
@@ -538,14 +502,12 @@ phpbb.ajax_callbacks = {};
* @param string id The name of the callback.
* @param function callback The callback to be called.
*/
-phpbb.add_ajax_callback = function(id, callback)
-{
- if (typeof callback === 'function')
- {
- phpbb.ajax_callbacks[id] = callback;
+phpbb.add_ajax_callback = function(id, callback) {
+ if (typeof callback === 'function') {
+ phpbb.ajaxCallbacks[id] = callback;
}
return this;
-}
+};
/**
@@ -555,12 +517,12 @@ phpbb.add_ajax_callback = function(id, callback)
*/
phpbb.add_ajax_callback('alt_text', function() {
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('title', alt_text);
- el.text(alt_text);
+ el.attr('title', altText);
+ eel.text(altText);
});
/**
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-12 03:21:34 +0000