diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-01-04 20:46:56 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-01-04 20:46:56 +0100 |
| commit | 46c33e08b5d46c5aafe963298367bd61cbadc5fd (patch) | |
| tree | f149262c972668c8cfe8332f9b8f9186f7bdb59a /phpBB/styles | |
| parent | 228580b6743b9650996284dd04a3f5de6c2447ca (diff) | |
| parent | d5a788ae5b615c1b6b642c631884a4d936be2a4c (diff) | |
| download | forums-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/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/ajax.js | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 6637df4c3d..abe6152db1 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -93,14 +93,12 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) { // This callback finds the post from the delete link, and removes it. phpbb.add_ajax_callback('post_delete', function() { var el = $(this), - post_id; - - if (el.attr('data-refresh') === undefined) - { - post_id = el[0].href.split('&p=')[1]; - var post = el.parents('#p' + post_id).css('pointer-events', 'none'); - if (post.hasClass('bg1') || post.hasClass('bg2')) - { + postId; + + if (el.attr('data-refresh') === undefined) { + postId = el[0].href.split('&p=')[1]; + var post = el.parents('#p' + postId).css('pointer-events', 'none'); + if (post.hasClass('bg1') || post.hasClass('bg2')) { var posts1 = post.nextAll('.bg1'); post.nextAll('.bg2').removeClass('bg2').addClass('bg1'); posts1.removeClass('bg1').addClass('bg2'); @@ -142,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, @@ -177,12 +174,9 @@ phpbb.ajaxify({ filter: function (data) { var action = $('#quick-mod-select').val(); - if (action === 'make_normal') - { + if (action === 'make_normal') { return $(this).find('select option[value="make_global"]').length > 0; - } - else if (action === 'lock' || action === 'unlock') - { + } else if (action === 'lock' || action === 'unlock') { return true; } |