diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-11-14 23:30:29 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-11-14 23:30:29 +0100 |
| commit | e39947e57e8b39319bb34597d2fb0a706bd1bc44 (patch) | |
| tree | efb2d772275de619e82184904e1b1a76d312244a /phpBB/adm/style/ajax.js | |
| parent | 857298e748685a6796a2ad1be4727098651c2688 (diff) | |
| download | forums-e39947e57e8b39319bb34597d2fb0a706bd1bc44.tar forums-e39947e57e8b39319bb34597d2fb0a706bd1bc44.tar.gz forums-e39947e57e8b39319bb34597d2fb0a706bd1bc44.tar.bz2 forums-e39947e57e8b39319bb34597d2fb0a706bd1bc44.tar.xz forums-e39947e57e8b39319bb34597d2fb0a706bd1bc44.zip | |
[ticket/11198] Store the swapping partners in vars and simplify the logic
PHPBB3-11198
Diffstat (limited to 'phpBB/adm/style/ajax.js')
| -rw-r--r-- | phpBB/adm/style/ajax.js | 86 |
1 files changed, 47 insertions, 39 deletions
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index 4dfe00c5dd..d780196173 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -11,92 +11,100 @@ var img_templates = { /** * The following callbacks are for reording items. row_down - * is triggered when a forum is moved down, and row_up is triggered when + * 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('row_down', function() { var el = $(this), - tr = el.parents('tr'); - + tr = el.parents('tr'), + tr_swap = 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')); - el.parents('span').siblings('.up').html(up_img); - - tr.next().find('.up').html(img_templates.up_disabled); - - var down_img = img_templates.down.clone().attr('href', tr.next().attr('data-down')); - tr.next().find('.down').html(down_img); + tr.find('.up').html(up_img); phpbb.ajaxify({ - selector: el.parents('span').siblings('.up').children('a'), + selector: tr.find('.up').children('a'), callback: 'row_up', overlay: false }); + + tr_swap.find('.up').html(img_templates.up_disabled); } - tr.insertAfter(tr.next()); + tr.insertAfter(tr_swap); - if (!tr.prev().is(':first-child') && tr.is(':last-child')) + /** + * 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')) { - el.replaceWith(img_templates.down_disabled); + tr.find('.down').html(img_templates.down_disabled); - var down_img = img_templates.down.clone().attr('href', tr.attr('data-down')); - tr.prev().find('.down').html(down_img); + var down_img = img_templates.down.clone().attr('href', tr_swap.attr('data-down')); + tr_swap.find('.down').html(down_img); phpbb.ajaxify({ - selector: tr.prev().find('.down').children('a'), + selector: tr_swap.find('.down').children('a'), callback: 'row_down', overlay: false }); } - else if (tr.is(':last-child')) - { - el.replaceWith(img_templates.down_disabled); - } }); phpbb.add_ajax_callback('row_up', function() { var el = $(this), - tr = el.parents('tr'); - + tr = el.parents('tr'), + tr_swap = 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')); - el.parents('span').siblings('.down').html(down_img); - - tr.prev().find('.down').html(img_templates.down_disabled); - - var up_img = img_templates.down.clone().attr('href', tr.prev().attr('data-up')); - tr.prev().find('.up').html(up_img); + tr.find('.down').html(down_img); phpbb.ajaxify({ - selector: el.parents('span').siblings('.down').children('a'), + selector: tr.find('.down').children('a'), callback: 'row_down', overlay: false }); + + tr_swap.find('.down').html(img_templates.down_disabled); } - tr.insertBefore(tr.prev()); + tr.insertBefore(tr_swap); - if (!tr.next().is(':last-child') && tr.is(':first-child')) + /** + * 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')) { - el.replaceWith(img_templates.up_disabled); + tr.find('.up').html(img_templates.up_disabled); - var up_img = img_templates.up.clone().attr('href', tr.attr('data-up')); - tr.next().find('.up').html(up_img); + var up_img = img_templates.up.clone().attr('href', tr_swap.attr('data-up')); + tr_swap.find('.up').html(up_img); phpbb.ajaxify({ - selector: tr.next().find('.up').children('a'), + selector: tr_swap.find('.up').children('a'), callback: 'row_up', overlay: false }); } - else if (tr.is(':first-child')) - { - el.replaceWith(img_templates.up_disabled); - } }); /** |