https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113371
Revision: 113371
Author: emsmith
Date: 2012-03-08 17:51:07 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
bug 34090 - fixes for oversighter view for hide/oversight panels
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-03-08 16:43:48 UTC (rev 113370)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-03-08 17:51:07 UTC (rev 113371)
@@ -143,7 +143,7 @@
'articlefeedbackv5-timestamp-weeks' => '{{PLURAL:$1|$1 week|$1 weeks}}',
'articlefeedbackv5-timestamp-seconds' => 'less than 1 minute',
'articlefeedbackv5-mask-text-hidden' => 'This post was hidden by an
authorized editor',
-
'articlefeedbackv5-mask-text-overarticlefeedbackv5-mask-text-hiddensight' =>
'This post was oversighted by an authorized editor',
+ 'articlefeedbackv5-mask-text-oversight' => 'This post was oversighted
by an authorized editor',
'articlefeedbackv5-mask-postnumber' => 'Post #$1',
/* Special page flyover panels */
Modified:
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2012-03-08 16:43:48 UTC (rev 113370)
+++
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2012-03-08 17:51:07 UTC (rev 113371)
@@ -479,7 +479,7 @@
$( '<span
class="articleFeedbackv5-feedback-hidden-marker"></span>' )
// this is on purpose html not text- $hide_user is a
link
.html( mw.msg( 'articlefeedbackv5-hidden', $hide_user,
$hide_timestamp) )
- .insertBefore( $row.find(
'.articleFeedbackv5-comment-wrap-h3' ) );
+ .insertBefore( $row.find(
'.articleFeedbackv5-comment-wrap' ) );
$.articleFeedbackv5special.maskPost( $row, 'hidden');
};
// }}}
@@ -521,14 +521,17 @@
*/
$.articleFeedbackv5special.markDeleted = function ( $row ,
$oversight_user, $oversight_timestamp) {
if ( $row.data( 'deleted' ) ) {
- $.articleFeedbackv5special.unmarkDeleted();
+ $.articleFeedbackv5special.unmarkDeleted( $row );
}
+ if ( $row.data( 'hidden' ) ) {
+ $.articleFeedbackv5special.unmarkHidden( $row );
+ }
$row.addClass( 'articleFeedbackv5-feedback-deleted' )
.data( 'deleted', true );
var $marker = $( '<span
class="articleFeedbackv5-feedback-deleted-marker"></span>' )
// this is on purpose html not text- $oversight_user is
a link
.html( mw.msg( 'articlefeedbackv5-deleted',
$oversight_user, $oversight_timestamp ) )
- .insertBefore( $row.find(
'.articleFeedbackv5-comment-wrap h3' ) );
+ .insertBefore( $row.find(
'.articleFeedbackv5-comment-wrap' ) );
$row.find( '.articleFeedbackv5-comment-wrap' ).addClass(
'articleFeedbackv5-h3-push');
$.articleFeedbackv5special.maskPost( $row, 'oversight' );
};
@@ -757,12 +760,13 @@
.addClass( 'articleFeedbackv5-unabuse-link' );
}
}
- if ( $( this ).hasClass(
'articleFeedbackv5-feedback-hidden' ) ) {
-
$.articleFeedbackv5special.markHidden( $( this ), $( this ).attr('hide-user'),
$( this ).attr('hide-timestamp'));
- }
+
if ( $( this ).hasClass(
'articleFeedbackv5-feedback-deleted' ) ) {
$.articleFeedbackv5special.markDeleted( $( this ), $( this
).attr('oversight-user'), $( this ).attr('oversight-timestamp'));
+ } else if ( $( this ).hasClass(
'articleFeedbackv5-feedback-hidden' ) ) {
+
$.articleFeedbackv5special.markHidden( $( this ), $( this ).attr('hide-user'),
$( this ).attr('hide-timestamp'));
}
+
} );
$(
'#articleFeedbackv5-feedback-count-total' ).text(
data['articlefeedbackv5-view-feedback'].count );
$.articleFeedbackv5special.listControls.continue =
data['articlefeedbackv5-view-feedback'].continue;
@@ -1126,6 +1130,8 @@
'apiFlagType': 'delete',
'apiFlagDir': 1,
'onSuccess': function( id, data ) {
+
+ // First we must possibly show
var $link = $(
'#articleFeedbackv5-oversight-link-' + id )
.attr( 'action', 'unoversight' )
.attr( 'id',
'articleFeedbackv5-unoversight-link-' + id )
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
