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

Merge PR #1178 branch 'marc1706/ticket/10949' into develop

Browse source 
# By Marc Alexander (2) and Callum Macrae (1)
# Via Marc Alexander
* marc1706/ticket/10949:
  [ticket/10949] Remove not needed comma
  [ticket/10949] Converted missing code to new JS coding guidelines
  [ticket/10949] Converted AJAX coding standards to new guidelines.
This commit is contained in:
Oleg Pudeyev 2013-01-08 16:36:35 -05:00
commit b96a2fce28
6 changed files with 173 additions and 225 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
phpBB/adm/style/ajax.js
View file

@ -2,11 +2,11 @@
"use strict"; "use strict";
var img_templates = { var imgTemplates = {
up: $('.template-up-img'), up: $('.template-up-img'),
up_disabled: $('.template-up-img-disabled'), upDisabled: $('.template-up-img-disabled'),
down: $('.template-down-img'), down: $('.template-down-img'),
down_disabled: $('.template-down-img-disabled') downDisabled: $('.template-down-img-disabled')
}; };
/** /**
@ -15,20 +15,19 @@ var img_templates = {
* an item is moved up. It moves the row up or down, and deactivates / * an item is moved up. It moves the row up or down, and deactivates /
* activates any up / down icons that require it (the ones at the top or bottom). * activates any up / down icons that require it (the ones at the top or bottom).
*/ */
phpbb.add_ajax_callback('row_down', function() { phpbb.addAjaxCallback('row_down', function() {
var el = $(this), var el = $(this),
tr = el.parents('tr'), tr = el.parents('tr'),
tr_swap = tr.next(); trSwap = tr.next();
/* /*
* If the element was the first one, we have to: * If the element was the first one, we have to:
* - Add the up-link to the row we moved * - Add the up-link to the row we moved
* - Remove the up-link on the next row * - Remove the up-link on the next row
*/ */
if (tr.is(':first-child')) if (tr.is(':first-child')) {
{ var upImg = imgTemplates.up.clone().attr('href', tr.attr('data-up'));
var up_img = img_templates.up.clone().attr('href', tr.attr('data-up')); tr.find('.up').html(upImg);
tr.find('.up').html(up_img);
phpbb.ajaxify({ phpbb.ajaxify({
selector: tr.find('.up').children('a'), selector: tr.find('.up').children('a'),
@ -36,45 +35,43 @@ phpbb.add_ajax_callback('row_down', function() {
overlay: false overlay: false
}); });
tr_swap.find('.up').html(img_templates.up_disabled.clone()); trSwap.find('.up').html(imgTemplates.upDisabled.clone());
} }
tr.insertAfter(tr_swap); tr.insertAfter(trSwap);
/* /*
* As well as: * As well as:
* - Remove the down-link on the moved row, if it is now the last row * - Remove the down-link on the moved row, if it is now the last row
* - Add the down-link to the next row, if it was the last row * - Add the down-link to the next row, if it was the last row
*/ */
if (tr.is(':last-child')) if (tr.is(':last-child')) {
{ tr.find('.down').html(imgTemplates.downDisabled.clone());
tr.find('.down').html(img_templates.down_disabled.clone());
var down_img = img_templates.down.clone().attr('href', tr_swap.attr('data-down')); var downImg = imgTemplates.down.clone().attr('href', trSwap.attr('data-down'));
tr_swap.find('.down').html(down_img); trSwap.find('.down').html(downImg);
phpbb.ajaxify({ phpbb.ajaxify({
selector: tr_swap.find('.down').children('a'), selector: trSwap.find('.down').children('a'),
callback: 'row_down', callback: 'row_down',
overlay: false overlay: false
}); });
} }
}); });
phpbb.add_ajax_callback('row_up', function() { phpbb.addAjaxCallback('row_up', function() {
var el = $(this), var el = $(this),
tr = el.parents('tr'), tr = el.parents('tr'),
tr_swap = tr.prev(); trSwap = tr.prev();
/* /*
* If the element was the last one, we have to: * If the element was the last one, we have to:
* - Add the down-link to the row we moved * - Add the down-link to the row we moved
* - Remove the down-link on the next row * - Remove the down-link on the next row
*/ */
if (tr.is(':last-child')) if (tr.is(':last-child')) {
{ var downImg = imgTemplates.down.clone().attr('href', tr.attr('data-down'));
var down_img = img_templates.down.clone().attr('href', tr.attr('data-down')); tr.find('.down').html(downImg);
tr.find('.down').html(down_img);
phpbb.ajaxify({ phpbb.ajaxify({
selector: tr.find('.down').children('a'), selector: tr.find('.down').children('a'),
@ -82,25 +79,24 @@ phpbb.add_ajax_callback('row_up', function() {
overlay: false overlay: false
}); });
tr_swap.find('.down').html(img_templates.down_disabled.clone()); trSwap.find('.down').html(imgTemplates.downDisabled.clone());
} }
tr.insertBefore(tr_swap); tr.insertBefore(trSwap);
/* /*
* As well as: * As well as:
* - Remove the up-link on the moved row, if it is now the first row * - Remove the up-link on the moved row, if it is now the first row
* - Add the up-link to the previous row, if it was the first row * - Add the up-link to the previous row, if it was the first row
*/ */
if (tr.is(':first-child')) if (tr.is(':first-child')) {
{ tr.find('.up').html(imgTemplates.upDisabled.clone());
tr.find('.up').html(img_templates.up_disabled.clone());
var up_img = img_templates.up.clone().attr('href', tr_swap.attr('data-up')); var upImg = imgTemplates.up.clone().attr('href', trSwap.attr('data-up'));
tr_swap.find('.up').html(up_img); trSwap.find('.up').html(upImg);
phpbb.ajaxify({ phpbb.ajaxify({
selector: tr_swap.find('.up').children('a'), selector: trSwap.find('.up').children('a'),
callback: 'row_up', callback: 'row_up',
overlay: false overlay: false
}); });
@ -112,29 +108,26 @@ phpbb.add_ajax_callback('row_up', function() {
* It does this by replacing the text, and replacing all instances of "activate" * It does this by replacing the text, and replacing all instances of "activate"
* in the href with "deactivate", and vice versa. * in the href with "deactivate", and vice versa.
*/ */
phpbb.add_ajax_callback('activate_deactivate', function(res) { phpbb.addAjaxCallback('activate_deactivate', function(res) {
var el = $(this), var el = $(this),
new_href = el.attr('href'); newHref = el.attr('href');
el.text(res.text); el.text(res.text);
if (new_href.indexOf('deactivate') !== -1) if (newHref.indexOf('deactivate') !== -1) {
{ newHref = newHref.replace('deactivate', 'activate')
new_href = new_href.replace('deactivate', 'activate') } else {
} newHref = newHref.replace('activate', 'deactivate')
else
{
new_href = new_href.replace('activate', 'deactivate')
} }
el.attr('href', new_href); el.attr('href', newHref);
}); });
/** /**
* The removes the parent row of the link or form that triggered the callback, * The removes the parent row of the link or form that triggered the callback,
* and is good for stuff like the removal of forums. * and is good for stuff like the removal of forums.
*/ */
phpbb.add_ajax_callback('row_delete', function() { phpbb.addAjaxCallback('row_delete', function() {
$(this).parents('tr').remove(); $(this).parents('tr').remove();
}); });
@ -145,8 +138,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,

4
phpBB/adm/style/timezone.js
View file

@ -1,11 +1,11 @@
(function($) { // Avoid conflicts with other libraries (function($) { // Avoid conflicts with other libraries
$('#tz_date').change(function() { $('#tz_date').change(function() {
phpbb.timezone_switch_date(false); phpbb.timezoneSwitchDate(false);
}); });
$(document).ready( $(document).ready(
phpbb.timezone_enable_date_selection phpbb.timezoneEnableDateSelection
); );
})(jQuery); // Avoid conflicts with other libraries })(jQuery); // Avoid conflicts with other libraries

262
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,46 +12,42 @@ 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
*/ */
phpbb.clearLoadingTimeout = function() { phpbb.clearLoadingTimeout = function() {
if (phpbbAlertTimer != null) { if (phpbbAlertTimer !== null) {
clearTimeout(phpbbAlertTimer); clearTimeout(phpbbAlertTimer);
phpbbAlertTimer = null; phpbbAlertTimer = null;
} }
} };
/** /**
* Display a simple alert similar to JSs native alert(). * Display a simple alert similar to JSs native alert().
@ -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.
@ -144,13 +135,13 @@ phpbb.confirm = function(msg, callback, fadedark) {
e.stopPropagation(); e.stopPropagation();
}); });
var click_handler = function(e) { var clickHandler = 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', clickHandler);
callback(res); callback(res);
if (e) { if (e) {
@ -158,11 +149,11 @@ phpbb.confirm = function(msg, callback, fadedark) {
e.stopPropagation(); e.stopPropagation();
} }
}; };
div.find('input[type="button"]').one('click', click_handler); div.find('input[type="button"]').one('click', clickHandler);
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.
@ -221,17 +207,16 @@ phpbb.confirm = function(msg, callback, fadedark) {
* @argument string string The querystring to parse. * @argument string string The querystring to parse.
* @returns object The object created. * @returns object The object created.
*/ */
phpbb.parse_querystring = function(string) { phpbb.parseQuerystring = 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,14 +381,14 @@ 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
* *
* @param bool keep_selection Shall we keep the value selected, or shall the user be forced to repick one. * @param bool keepSelection Shall we keep the value selected, or shall the user be forced to repick one.
*/ */
phpbb.timezone_switch_date = function(keep_selection) { phpbb.timezoneSwitchDate = function(keepSelection) {
if ($('#timezone_copy').length == 0) { if ($('#timezone_copy').length == 0) {
// We make a backup of the original dropdown, so we can remove optgroups // We make a backup of the original dropdown, so we can remove optgroups
// instead of setting display to none, because IE and chrome will not // instead of setting display to none, because IE and chrome will not
@ -448,30 +412,30 @@ phpbb.timezone_switch_date = function(keep_selection) {
if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() == 1) { if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() == 1) {
// If there is only one timezone for the selected date, we just select that automatically. // If there is only one timezone for the selected date, we just select that automatically.
$("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option:first").attr('selected', true); $("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option:first").attr('selected', true);
keep_selection = true; keepSelection = true;
} }
if (typeof keep_selection !== 'undefined' && !keep_selection) { if (typeof keepSelection !== 'undefined' && !keepSelection) {
var timezoneOptions = $('#timezone > optgroup option'); var timezoneOptions = $('#timezone > optgroup option');
if (timezoneOptions.filter(':selected').length <= 0) { if (timezoneOptions.filter(':selected').length <= 0) {
timezoneOptions.filter(':first').attr('selected', true); timezoneOptions.filter(':first').attr('selected', true);
} }
} }
} };
/** /**
* Display the date/time select * Display the date/time select
*/ */
phpbb.timezone_enable_date_selection = function() { phpbb.timezoneEnableDateSelection = function() {
$('#tz_select_date').css('display', 'block'); $('#tz_select_date').css('display', 'block');
} };
/** /**
* Preselect a date/time or suggest one, if it is not picked. * Preselect a date/time or suggest one, if it is not picked.
* *
* @param bool force_selector Shall we select the suggestion? * @param bool forceSelector Shall we select the suggestion?
*/ */
phpbb.timezone_preselect_select = function(force_selector) { phpbb.timezonePreselectSelect = function(forceSelector) {
// The offset returned here is in minutes and negated. // The offset returned here is in minutes and negated.
// http://www.w3schools.com/jsref/jsref_getTimezoneOffset.asp // http://www.w3schools.com/jsref/jsref_getTimezoneOffset.asp
@ -500,21 +464,21 @@ phpbb.timezone_preselect_select = function(force_selector) {
} }
var prefix = 'GMT' + sign + hours + ':' + minutes; var prefix = 'GMT' + sign + hours + ':' + minutes;
var prefix_length = prefix.length; var prefixLength = prefix.length;
var selector_options = $('#tz_date > option'); var selectorOptions = $('#tz_date > option');
for (var i = 0; i < selector_options.length; ++i) { for (var i = 0; i < selectorOptions.length; ++i) {
var option = selector_options[i]; var option = selectorOptions[i];
if (option.value.substring(0, prefix_length) == prefix) { if (option.value.substring(0, prefixLength) == prefix) {
if ($('#tz_date').val() != option.value && !force_selector) { if ($('#tz_date').val() != option.value && !forceSelector) {
// We do not select the option for the user, but notify him, // We do not select the option for the user, but notify him,
// that we would suggest a different setting. // that we would suggest a different setting.
phpbb.timezone_switch_date(true); phpbb.timezoneSwitchDate(true);
$('#tz_select_date_suggest').css('display', 'inline'); $('#tz_select_date_suggest').css('display', 'inline');
} else { } else {
option.selected = true; option.selected = true;
phpbb.timezone_switch_date(!force_selector); phpbb.timezoneSwitchDate(!forceSelector);
$('#tz_select_date_suggest').css('display', 'none'); $('#tz_select_date_suggest').css('display', 'none');
} }
@ -526,9 +490,9 @@ phpbb.timezone_preselect_select = function(force_selector) {
return; return;
} }
} }
} };
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.addAjaxCallback = function(id, callback) {
{ if (typeof callback === 'function') {
if (typeof callback === 'function') phpbb.ajaxCallbacks[id] = callback;
{
phpbb.ajax_callbacks[id] = callback;
} }
return this; return this;
} };
/** /**
@ -553,14 +515,14 @@ phpbb.add_ajax_callback = function(id, callback)
* the alt-text data attribute, and replaces the text in the attribute with the * the alt-text data attribute, and replaces the text in the attribute with the
* current text so that the process can be repeated. * current text so that the process can be repeated.
*/ */
phpbb.add_ajax_callback('alt_text', function() { phpbb.addAjaxCallback('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);
}); });
/** /**
@ -572,28 +534,28 @@ phpbb.add_ajax_callback('alt_text', function() {
* Additionally it replaces the class of the link's parent * Additionally it replaces the class of the link's parent
* and changes the link itself. * and changes the link itself.
*/ */
phpbb.add_ajax_callback('toggle_link', function() { phpbb.addAjaxCallback('toggle_link', function() {
var el = $(this), var el = $(this),
toggle_text, toggleText,
toggle_url, toggleUrl,
toggle_class; toggleClass;
// Toggle link text // Toggle link text
toggle_text = el.attr('data-toggle-text'); toggleText = el.attr('data-toggle-text');
el.attr('data-toggle-text', el.text()); el.attr('data-toggle-text', el.text());
el.attr('title', toggle_text); el.attr('title', toggleText);
el.text(toggle_text); el.text(toggleText);
// Toggle link url // Toggle link url
toggle_url = el.attr('data-toggle-url'); toggleUrl = el.attr('data-toggle-url');
el.attr('data-toggle-url', el.attr('href')); el.attr('data-toggle-url', el.attr('href'));
el.attr('href', toggle_url); el.attr('href', toggleUrl);
// Toggle class of link parent // Toggle class of link parent
toggle_class = el.attr('data-toggle-class'); toggleClass = el.attr('data-toggle-class');
el.attr('data-toggle-class', el.parent().attr('class')); el.attr('data-toggle-class', el.parent().attr('class'));
el.parent().attr('class', toggle_class); el.parent().attr('class', toggleClass);
}); });
})(jQuery); // Avoid conflicts with other libraries })(jQuery); // Avoid conflicts with other libraries

36
phpBB/styles/prosilver/template/ajax.js
View file

@ -14,13 +14,13 @@ phpbb.closeDarkenWrapper = function(delay) {
}; };
// This callback will mark all forum icons read // This callback will mark all forum icons read
phpbb.add_ajax_callback('mark_forums_read', function(res) { phpbb.addAjaxCallback('mark_forums_read', function(res) {
var readTitle = res.NO_UNREAD_POSTS; var readTitle = res.NO_UNREAD_POSTS;
var unreadTitle = res.UNREAD_POSTS; var unreadTitle = res.UNREAD_POSTS;
var iconsArray = { var iconsArray = {
'forum_unread': 'forum_read', 'forum_unread': 'forum_read',
'forum_unread_subforum': 'forum_read_subforum', 'forum_unread_subforum': 'forum_read_subforum',
'forum_unread_locked': 'forum_read_locked', 'forum_unread_locked': 'forum_read_locked'
}; };
$('li.row').find('dl[class*="forum_unread"]').each(function() { $('li.row').find('dl[class*="forum_unread"]').each(function() {
@ -44,7 +44,7 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
}); });
// This callback will mark all topic icons read // This callback will mark all topic icons read
phpbb.add_ajax_callback('mark_topics_read', function(res) { phpbb.addAjaxCallback('mark_topics_read', function(res) {
var readTitle = res.NO_UNREAD_POSTS; var readTitle = res.NO_UNREAD_POSTS;
var unreadTitle = res.UNREAD_POSTS; var unreadTitle = res.UNREAD_POSTS;
var iconsArray = { var iconsArray = {
@ -91,16 +91,14 @@ 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.addAjaxCallback('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');
@ -112,7 +110,7 @@ phpbb.add_ajax_callback('post_delete', function() {
}); });
// This callback removes the approve / disapprove div or link. // This callback removes the approve / disapprove div or link.
phpbb.add_ajax_callback('post_approve', function(res) { phpbb.addAjaxCallback('post_approve', function(res) {
var remove = (res.approved) ? $(this) : $(this).parents('.post'); var remove = (res.approved) ? $(this) : $(this).parents('.post');
$(remove).css('pointer-events', 'none').fadeOut(function() { $(remove).css('pointer-events', 'none').fadeOut(function() {
$(this).remove(); $(this).remove();
@ -120,12 +118,12 @@ phpbb.add_ajax_callback('post_approve', function(res) {
}); });
// This removes the parent row of the link or form that fired the callback. // This removes the parent row of the link or form that fired the callback.
phpbb.add_ajax_callback('row_delete', function() { phpbb.addAjaxCallback('row_delete', function() {
$(this).parents('tr').remove(); $(this).parents('tr').remove();
}); });
// This handles friend / foe additions removals. // This handles friend / foe additions removals.
phpbb.add_ajax_callback('zebra', function(res) { phpbb.addAjaxCallback('zebra', function(res) {
var zebra; var zebra;
if (res.success) { if (res.success) {
@ -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;
} }

8
phpBB/styles/prosilver/template/timezone.js
View file

@ -1,19 +1,19 @@
(function($) { // Avoid conflicts with other libraries (function($) { // Avoid conflicts with other libraries
$('#tz_date').change(function() { $('#tz_date').change(function() {
phpbb.timezone_switch_date(false); phpbb.timezoneSwitchDate(false);
}); });
$('#tz_select_date_suggest').click(function(){ $('#tz_select_date_suggest').click(function(){
phpbb.timezone_preselect_select(true); phpbb.timezonePreselectSelect(true);
}); });
$(document).ready( $(document).ready(
phpbb.timezone_enable_date_selection phpbb.timezoneEnableDateSelection
); );
$(document).ready( $(document).ready(
phpbb.timezone_preselect_select($('#tz_select_date_suggest').attr('data-is-registration') == 'true') phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('data-is-registration') == 'true')
); );
})(jQuery); // Avoid conflicts with other libraries })(jQuery); // Avoid conflicts with other libraries

8
phpBB/styles/subsilver2/template/timezone.js
View file

@ -1,19 +1,19 @@
(function($) { // Avoid conflicts with other libraries (function($) { // Avoid conflicts with other libraries
$('#tz_date').change(function() { $('#tz_date').change(function() {
phpbb.timezone_switch_date(false); phpbb.timezoneSwitchDate(false);
}); });
$('#tz_select_date_suggest').click(function(){ $('#tz_select_date_suggest').click(function(){
phpbb.timezone_preselect_select(true); phpbb.timezonePreselectSelect(true);
}); });
$(document).ready( $(document).ready(
phpbb.timezone_enable_date_selection phpbb.timezoneEnableDateSelection
); );
$(document).ready( $(document).ready(
phpbb.timezone_preselect_select($('#tz_select_date_suggest').attr('data-is-registration') == 'true') phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('data-is-registration') == 'true')
); );
})(jQuery); // Avoid conflicts with other libraries })(jQuery); // Avoid conflicts with other libraries