aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style/ajax.js
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-09-05 13:56:57 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2013-09-05 13:56:57 -0500
commite8ab8fe0bc7d087fe3c9b5d2a3e545f228bb3096 (patch)
tree6a053afa0a156204112b480707608cac60770ac5 /phpBB/adm/style/ajax.js
parentabaa53b0b295358efcf591587485c01a027cd5cb (diff)
parentdd86e8d0ae0179cf50076cdb1a8020266b6432a5 (diff)
downloadforums-e8ab8fe0bc7d087fe3c9b5d2a3e545f228bb3096.tar
forums-e8ab8fe0bc7d087fe3c9b5d2a3e545f228bb3096.tar.gz
forums-e8ab8fe0bc7d087fe3c9b5d2a3e545f228bb3096.tar.bz2
forums-e8ab8fe0bc7d087fe3c9b5d2a3e545f228bb3096.tar.xz
forums-e8ab8fe0bc7d087fe3c9b5d2a3e545f228bb3096.zip
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323
# By Joas Schilling (613) and others # Via Andreas Fischer (214) and others * 'develop' of github.com:phpbb/phpbb3: (2494 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/includes/functions_privmsgs.php
Diffstat (limited to 'phpBB/adm/style/ajax.js')
-rw-r--r--phpBB/adm/style/ajax.js90
1 files changed, 45 insertions, 45 deletions
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 3ccb368665..efb0639f1b 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -2,11 +2,11 @@
"use strict";
-var img_templates = {
+var imgTemplates = {
up: $('.template-up-img'),
- up_disabled: $('.template-up-img-disabled'),
+ upDisabled: $('.template-up-img-disabled'),
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 /
* 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),
tr = el.parents('tr'),
- tr_swap = tr.next();
+ trSwap = tr.next();
/*
* If the element was the first one, we have to:
* - Add the up-link to the row we moved
* - Remove the up-link on the next row
*/
- if (tr.is(':first-child'))
- {
- var up_img = img_templates.up.clone().attr('href', tr.attr('data-up'));
- tr.find('.up').html(up_img);
+ if (tr.is(':first-child')) {
+ var upImg = imgTemplates.up.clone().attr('href', tr.attr('data-up'));
+ tr.find('.up').html(upImg);
phpbb.ajaxify({
selector: tr.find('.up').children('a'),
@@ -36,45 +35,43 @@ phpbb.add_ajax_callback('row_down', function() {
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:
* - 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
*/
- if (tr.is(':last-child'))
- {
- tr.find('.down').html(img_templates.down_disabled.clone());
+ if (tr.is(':last-child')) {
+ tr.find('.down').html(imgTemplates.downDisabled.clone());
- var down_img = img_templates.down.clone().attr('href', tr_swap.attr('data-down'));
- tr_swap.find('.down').html(down_img);
+ var downImg = imgTemplates.down.clone().attr('href', trSwap.attr('data-down'));
+ trSwap.find('.down').html(downImg);
phpbb.ajaxify({
- selector: tr_swap.find('.down').children('a'),
+ selector: trSwap.find('.down').children('a'),
callback: 'row_down',
overlay: false
});
}
});
-phpbb.add_ajax_callback('row_up', function() {
+phpbb.addAjaxCallback('row_up', function() {
var el = $(this),
tr = el.parents('tr'),
- tr_swap = tr.prev();
+ trSwap = tr.prev();
/*
* If the element was the last one, we have to:
* - Add the down-link to the row we moved
* - Remove the down-link on the next row
*/
- if (tr.is(':last-child'))
- {
- var down_img = img_templates.down.clone().attr('href', tr.attr('data-down'));
- tr.find('.down').html(down_img);
+ if (tr.is(':last-child')) {
+ var downImg = imgTemplates.down.clone().attr('href', tr.attr('data-down'));
+ tr.find('.down').html(downImg);
phpbb.ajaxify({
selector: tr.find('.down').children('a'),
@@ -82,25 +79,24 @@ phpbb.add_ajax_callback('row_up', function() {
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:
* - 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
*/
- if (tr.is(':first-child'))
- {
- tr.find('.up').html(img_templates.up_disabled.clone());
+ if (tr.is(':first-child')) {
+ tr.find('.up').html(imgTemplates.upDisabled.clone());
- var up_img = img_templates.up.clone().attr('href', tr_swap.attr('data-up'));
- tr_swap.find('.up').html(up_img);
+ var upImg = imgTemplates.up.clone().attr('href', trSwap.attr('data-up'));
+ trSwap.find('.up').html(upImg);
phpbb.ajaxify({
- selector: tr_swap.find('.up').children('a'),
+ selector: trSwap.find('.up').children('a'),
callback: 'row_up',
overlay: false
});
@@ -112,30 +108,29 @@ phpbb.add_ajax_callback('row_up', function() {
* It does this by replacing the text, and replacing all instances of "activate"
* 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),
- new_href = el.attr('href');
+ newHref = el.attr('href');
el.text(res.text);
- if (new_href.indexOf('deactivate') !== -1)
- {
- new_href = new_href.replace('deactivate', 'activate')
- }
- else
- {
- new_href = new_href.replace('activate', 'deactivate')
+ if (newHref.indexOf('deactivate') !== -1) {
+ newHref = newHref.replace('deactivate', 'activate');
+ } else {
+ newHref = newHref.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,
* and is good for stuff like the removal of forums.
*/
-phpbb.add_ajax_callback('row_delete', function() {
- $(this).parents('tr').remove();
+phpbb.addAjaxCallback('row_delete', function(res) {
+ if (res.SUCCESS !== false) {
+ $(this).parents('tr').remove();
+ }
});
@@ -145,8 +140,7 @@ $('[data-ajax]').each(function() {
ajax = $this.attr('data-ajax'),
fn;
- if (ajax !== 'false')
- {
+ if (ajax !== 'false') {
fn = (ajax !== 'true') ? ajax : null;
phpbb.ajaxify({
selector: this,
@@ -156,6 +150,12 @@ $('[data-ajax]').each(function() {
}
});
+/**
+* Automatically resize textarea
+*/
+$(document).ready(function() {
+ phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75});
+});
})(jQuery); // Avoid conflicts with other libraries
generated by cgit v1.2.1 (git 2.21.0) at 2025-07-21 09:46:13 +0000