1 files changed, 71 insertions, 57 deletions
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 12541cb057..294a35b615 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -2,84 +2,102 @@
 
 "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')
 };
 
 /**
- * The following callbacks are  for reording forums in acp_forums. forum_down
- * is triggered when a forum is moved down, and forum_up is triggered when
- * a forum is moved up. It moves the row up or down, and deactivates /
+ * The following callbacks are for reording items. row_down
+ * is triggered when an item is moved down, and row_up is triggered when
+ * 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('forum_down', function() {
+phpbb.addAjaxCallback('row_down', function() {
 	var el = $(this),
-		tr = el.parents('tr');
-
-	if (tr.is(':first-child'))
-	{
-		var up_img = img_templates.up.clone().attr('href', tr.attr('data-up'));
-		el.parents('span').siblings('.up').html(up_img);
-
-		tr.next().find('.up').html(img_templates.up_disabled);
+		tr = el.parents('tr'),
+		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 upImg = imgTemplates.up.clone().attr('href', tr.attr('data-up'));
+		tr.find('.up').html(upImg);
 
 		phpbb.ajaxify({
-			selector: el.parents('span').siblings('.up').children('a'),
-			callback: 'forum_up',
+			selector: tr.find('.up').children('a'),
+			callback: 'row_up',
 			overlay: false
 		});
+
+		trSwap.find('.up').html(imgTemplates.upDisabled.clone());
 	}
 
-	tr.insertAfter(tr.next());
+	tr.insertAfter(trSwap);
 
-	if (tr.is(':last-child'))
-	{
-		el.replaceWith(img_templates.down_disabled);
+	/*
+	* 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(imgTemplates.downDisabled.clone());
 
-		var down_img = img_templates.down.clone().attr('href', tr.attr('data-down'));
-		tr.prev().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.prev().find('.down').children('a'),
-			callback: 'forum_down',
+			selector: trSwap.find('.down').children('a'),
+			callback: 'row_down',
 			overlay: false
 		});
 	}
 });
 
-phpbb.add_ajax_callback('forum_up', function() {
+phpbb.addAjaxCallback('row_up', function() {
 	var el = $(this),
-		tr = el.parents('tr');
-
-	if (tr.is(':last-child'))
-	{
-		var down_img = img_templates.down.clone().attr('href', tr.attr('data-down'));
-		el.parents('span').siblings('.down').html(down_img);
-
-		tr.prev().find('.down').html(img_templates.down_disabled);
+		tr = el.parents('tr'),
+		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 downImg = imgTemplates.down.clone().attr('href', tr.attr('data-down'));
+		tr.find('.down').html(downImg);
 
 		phpbb.ajaxify({
-			selector: el.parents('span').siblings('.down').children('a'),
-			callback: 'forum_down',
+			selector: tr.find('.down').children('a'),
+			callback: 'row_down',
 			overlay: false
 		});
+
+		trSwap.find('.down').html(imgTemplates.downDisabled.clone());
 	}
 
-	tr.insertBefore(tr.prev());
+	tr.insertBefore(trSwap);
 
-	if (tr.is(':first-child'))
-	{
-		el.replaceWith(img_templates.up_disabled);
+	/*
+	* 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(imgTemplates.upDisabled.clone());
 
-		var up_img = img_templates.up.clone().attr('href', tr.attr('data-up'));
-		tr.next().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.next().find('.up').children('a'),
-			callback: 'forum_up',
+			selector: trSwap.find('.up').children('a'),
+			callback: 'row_up',
 			overlay: false
 		});
 	}
@@ -90,29 +108,26 @@ phpbb.add_ajax_callback('forum_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() {
+phpbb.addAjaxCallback('row_delete', function() {
 	$(this).parents('tr').remove();
 });
 
@@ -123,8 +138,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,