| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php |
| — | — | @@ -143,7 +143,7 @@ |
| 144 | 144 | 'articlefeedbackv5-timestamp-weeks' => '{{PLURAL:$1|$1 week|$1 weeks}}', |
| 145 | 145 | 'articlefeedbackv5-timestamp-seconds' => 'less than 1 minute', |
| 146 | 146 | 'articlefeedbackv5-mask-text-hidden' => 'This post was hidden by an authorized editor', |
| 147 | | - 'articlefeedbackv5-mask-text-overarticlefeedbackv5-mask-text-hiddensight' => 'This post was oversighted by an authorized editor', |
| | 147 | + 'articlefeedbackv5-mask-text-oversight' => 'This post was oversighted by an authorized editor', |
| 148 | 148 | 'articlefeedbackv5-mask-postnumber' => 'Post #$1', |
| 149 | 149 | |
| 150 | 150 | /* Special page flyover panels */ |
| Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js |
| — | — | @@ -479,7 +479,7 @@ |
| 480 | 480 | $( '<span class="articleFeedbackv5-feedback-hidden-marker"></span>' ) |
| 481 | 481 | // this is on purpose html not text- $hide_user is a link |
| 482 | 482 | .html( mw.msg( 'articlefeedbackv5-hidden', $hide_user, $hide_timestamp) ) |
| 483 | | - .insertBefore( $row.find( '.articleFeedbackv5-comment-wrap-h3' ) ); |
| | 483 | + .insertBefore( $row.find( '.articleFeedbackv5-comment-wrap' ) ); |
| 484 | 484 | $.articleFeedbackv5special.maskPost( $row, 'hidden'); |
| 485 | 485 | }; |
| 486 | 486 | // }}} |
| — | — | @@ -521,14 +521,17 @@ |
| 522 | 522 | */ |
| 523 | 523 | $.articleFeedbackv5special.markDeleted = function ( $row , $oversight_user, $oversight_timestamp) { |
| 524 | 524 | if ( $row.data( 'deleted' ) ) { |
| 525 | | - $.articleFeedbackv5special.unmarkDeleted(); |
| | 525 | + $.articleFeedbackv5special.unmarkDeleted( $row ); |
| 526 | 526 | } |
| | 527 | + if ( $row.data( 'hidden' ) ) { |
| | 528 | + $.articleFeedbackv5special.unmarkHidden( $row ); |
| | 529 | + } |
| 527 | 530 | $row.addClass( 'articleFeedbackv5-feedback-deleted' ) |
| 528 | 531 | .data( 'deleted', true ); |
| 529 | 532 | var $marker = $( '<span class="articleFeedbackv5-feedback-deleted-marker"></span>' ) |
| 530 | 533 | // this is on purpose html not text- $oversight_user is a link |
| 531 | 534 | .html( mw.msg( 'articlefeedbackv5-deleted', $oversight_user, $oversight_timestamp ) ) |
| 532 | | - .insertBefore( $row.find( '.articleFeedbackv5-comment-wrap h3' ) ); |
| | 535 | + .insertBefore( $row.find( '.articleFeedbackv5-comment-wrap' ) ); |
| 533 | 536 | $row.find( '.articleFeedbackv5-comment-wrap' ).addClass( 'articleFeedbackv5-h3-push'); |
| 534 | 537 | $.articleFeedbackv5special.maskPost( $row, 'oversight' ); |
| 535 | 538 | }; |
| — | — | @@ -757,12 +760,13 @@ |
| 758 | 761 | .addClass( 'articleFeedbackv5-unabuse-link' ); |
| 759 | 762 | } |
| 760 | 763 | } |
| 761 | | - if ( $( this ).hasClass( 'articleFeedbackv5-feedback-hidden' ) ) { |
| 762 | | - $.articleFeedbackv5special.markHidden( $( this ), $( this ).attr('hide-user'), $( this ).attr('hide-timestamp')); |
| 763 | | - } |
| | 764 | + |
| 764 | 765 | if ( $( this ).hasClass( 'articleFeedbackv5-feedback-deleted' ) ) { |
| 765 | 766 | $.articleFeedbackv5special.markDeleted( $( this ), $( this ).attr('oversight-user'), $( this ).attr('oversight-timestamp')); |
| | 767 | + } else if ( $( this ).hasClass( 'articleFeedbackv5-feedback-hidden' ) ) { |
| | 768 | + $.articleFeedbackv5special.markHidden( $( this ), $( this ).attr('hide-user'), $( this ).attr('hide-timestamp')); |
| 766 | 769 | } |
| | 770 | + |
| 767 | 771 | } ); |
| 768 | 772 | $( '#articleFeedbackv5-feedback-count-total' ).text( data['articlefeedbackv5-view-feedback'].count ); |
| 769 | 773 | $.articleFeedbackv5special.listControls.continue = data['articlefeedbackv5-view-feedback'].continue; |
| — | — | @@ -1126,6 +1130,8 @@ |
| 1127 | 1131 | 'apiFlagType': 'delete', |
| 1128 | 1132 | 'apiFlagDir': 1, |
| 1129 | 1133 | 'onSuccess': function( id, data ) { |
| | 1134 | + |
| | 1135 | + // First we must possibly show |
| 1130 | 1136 | var $link = $( '#articleFeedbackv5-oversight-link-' + id ) |
| 1131 | 1137 | .attr( 'action', 'unoversight' ) |
| 1132 | 1138 | .attr( 'id', 'articleFeedbackv5-unoversight-link-' + id ) |