http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97969
Revision: 97969
Author: aaron
Date: 2011-09-23 22:45:48 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
FU r97886:
* Check if setReviewingStatus() actually succeeds
* Optimized jQuery selecting a bit (engine is RTL)
* Removed highlightning of "please review" msg and tweaked wording
* Reduced JS code duplication
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php
trunk/extensions/FlaggedRevs/presentation/language/RevisionReview.i18n.php
trunk/extensions/FlaggedRevs/presentation/modules/review.js
Modified: trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php
2011-09-23 22:44:29 UTC (rev 97968)
+++ trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php
2011-09-23 22:45:48 UTC (rev 97969)
@@ -144,29 +144,25 @@
}
$form .= "<p>";
if ( $u !== null ) { // page under review...
- $form .= '<span class="fr-under-review">';
if ( $u != $this->user->getName() ) { // by another
user...
+ $form .= '<span class="fr-under-review">';
$msg = $priorRevId
? 'revreview-poss-conflict-c'
: 'revreview-poss-conflict-p';
$form .= wfMsgExt( $msg, 'parseinline',
$u, $wgLang->date( $ts, true ),
$wgLang->time( $ts, true ) );
+ $form .= "</span>";
} else { // by this user...
+ $form .= '<span id="mw-fr-reviewing-status">';
// JS widget
$msg = $priorRevId
? 'revreview-adv-reviewing-c'
: 'revreview-adv-reviewing-p';
- $form .= wfMsgHtml( $msg );
+ $form .= wfMsg( $msg ); // don't escape
+ $form .= "</span>";
}
- $form .= "</span>";
- } else { // page not under review; add JS button
+ } else { // page not under review; add JS widget
$form .= '<span id="mw-fr-reviewing-status"
style="display:none;"></span>';
}
- # Let user toggle advertising that they are reviewing this
- if ( $u === null || $u === $this->user->getName() ) {
- $form .= '<span id="mw-fr-reviewing-toggle"
style="display:none;">';
- $form .= ' (<a href="javascript:void()"></a>)'; // JS
activated
- $form .= '</span>';
- }
$form .= "</p>\n";
if ( $disabled ) {
Modified:
trunk/extensions/FlaggedRevs/presentation/language/RevisionReview.i18n.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/language/RevisionReview.i18n.php
2011-09-23 22:44:29 UTC (rev 97968)
+++ trunk/extensions/FlaggedRevs/presentation/language/RevisionReview.i18n.php
2011-09-23 22:45:48 UTC (rev 97969)
@@ -65,10 +65,10 @@
'revreview-successful2' => '\'\'\'Revision of [[:$1|$1]]
successfully unflagged.\'\'\'',
'revreview-poss-conflict-p' => '\'\'\'Warning: [[User:$1|$1]]
started reviewing this page on $2 at $3.\'\'\'',
'revreview-poss-conflict-c' => '\'\'\'Warning: [[User:$1|$1]]
started reviewing these changes on $2 at $3.\'\'\'',
- 'revreview-adv-reviewing-p' => 'Notice: Other reviewers can see that
you are reviewing this page.',
- 'revreview-adv-reviewing-c' => 'Notice: Other reviewers can see that
you are reviewing these changes.',
- 'revreview-sadv-reviewing-p' => 'Notice: Please advertise yourself as
reviewing this page.',
- 'revreview-sadv-reviewing-c' => 'Notice: Please advertise yourself as
reviewing these changes.',
+ 'revreview-adv-reviewing-p' => '<span
class="fr-under-review">Notice: Other reviewers can see that you are reviewing
this page.</span> (<a id="mw-fr-reviewing-stop"
href="javascript:void(0)">de-advertise</a>)',
+ 'revreview-adv-reviewing-c' => '<span
class="fr-under-review">Notice: Other reviewers can see that you are reviewing
these changes.</span> (<a id="mw-fr-reviewing-stop"
href="javascript:void(0)">de-advertise</a>)',
+ 'revreview-sadv-reviewing-p' => 'You can <a
id="mw-fr-reviewing-start" href="javascript:void(0)">advertise</a> yourself as
reviewing this page to other users.',
+ 'revreview-sadv-reviewing-c' => 'You can <a
id="mw-fr-reviewing-start" href="javascript:void(0)">advertise</a> yourself as
reviewing these changes to other users.',
'revreview-advertise-start' => 'Advertise',
'revreview-advertise-stop' => 'De-advertise',
'revreview-toolow' => '\'\'\'You must rate each of the
attributes higher than "inadequate" in order for a revision to be considered
reviewed.\'\'\'
Modified: trunk/extensions/FlaggedRevs/presentation/modules/review.js
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/modules/review.js 2011-09-23
22:44:29 UTC (rev 97968)
+++ trunk/extensions/FlaggedRevs/presentation/modules/review.js 2011-09-23
22:45:48 UTC (rev 97969)
@@ -328,64 +328,47 @@
'enableAjaxReviewActivity': function() {
// User is already reviewing in another tab...
if ( $('#mw-fr-user-reviewing').val() == 1 ) {
- var msgkey = $('#mw-fr-input-refid')
- ? 'revreview-adv-reviewing-c'
- : 'revreview-adv-reviewing-p';
- $('#mw-fr-reviewing-status').html(
- mw.msg( msgkey, [mw.config.get('wgUserName')] )
// advertised notice
- );
- $('#mw-fr-reviewing-toggle a').html(
- mw.msg('revreview-advertise-stop')
- ).click( FlaggedRevsReview.deadvertiseReviewing );
+ FlaggedRevsReview.isUserReviewing = 1;
+ FlaggedRevsReview.advertiseReviewing( null, true );
// User is not already reviewing this....
} else {
- var msgkey = $('#mw-fr-input-refid')
- ? 'revreview-sadv-reviewing-c'
- : 'revreview-sadv-reviewing-p';
- $('#mw-fr-reviewing-status').html(
- mw.msg( msgkey, [mw.config.get('wgUserName')] )
// suggest to advertise
- );
-
- $('#mw-fr-reviewing-toggle a').html(
- mw.msg('revreview-advertise-start')
- ).click( FlaggedRevsReview.advertiseReviewing );
+ FlaggedRevsReview.deadvertiseReviewing( null, true );
}
- $('#mw-fr-reviewing-status').addClass('fr-under-review').show();
- $('#mw-fr-reviewing-toggle').show();
+ $('#mw-fr-reviewing-status').show();
},
/*
* Flag users as "now reviewing"
*/
- 'advertiseReviewing': function() {
- FlaggedRevsReview.setReviewingStatus( 1 );
+ 'advertiseReviewing': function( e, isInitial ) {
+ if ( isInitial !== true ) { // don't send if just setting up
form
+ if ( !FlaggedRevsReview.setReviewingStatus( 1 ) ) {
+ return; // failed
+ }
+ }
+ // Update notice to say that user is advertising...
var msgkey = $('#mw-fr-input-refid')
? 'revreview-adv-reviewing-c' // diff
: 'revreview-adv-reviewing-p' // page
- $('#mw-fr-reviewing-status').html(
- mw.msg( msgkey, [mw.config.get('wgUserName')] )
- );
- // Invert toggle text/function...
- $('#mw-fr-reviewing-toggle a').html(
- mw.msg('revreview-advertise-stop')
- ).unbind('click').click( FlaggedRevsReview.deadvertiseReviewing
);
+ $('#mw-fr-reviewing-status').html( mw.msg( msgkey,
[mw.config.get('wgUserName')] ) );
+ $('#mw-fr-reviewing-stop').click(
FlaggedRevsReview.deadvertiseReviewing );
},
/*
* Flag users as "no longer reviewing"
*/
- 'deadvertiseReviewing': function() {
- FlaggedRevsReview.setReviewingStatus( 0 );
+ 'deadvertiseReviewing': function( e, isInitial ) {
+ if ( isInitial !== true ) { // don't send if just setting up
form
+ if ( !FlaggedRevsReview.setReviewingStatus( 0 ) ) {
+ return; // failed
+ }
+ }
+ // Update notice to say that user is not advertising...
var msgkey = $('#mw-fr-input-refid')
? 'revreview-sadv-reviewing-c' // diff
: 'revreview-sadv-reviewing-p' // page
- $('#mw-fr-reviewing-status').html(
- mw.msg( msgkey, [mw.config.get('wgUserName')] )
- );
- // Invert toggle text/function...
- $('#mw-fr-reviewing-toggle a').html(
- mw.msg('revreview-advertise-start')
- ).unbind('click').click( FlaggedRevsReview.advertiseReviewing );
+ $('#mw-fr-reviewing-status').html( mw.msg( msgkey,
[mw.config.get('wgUserName')] ) );
+ $('#mw-fr-reviewing-start').click(
FlaggedRevsReview.advertiseReviewing );
},
/*
@@ -412,8 +395,12 @@
async : false
});
}
- FlaggedRevsReview.isUserReviewing = value;
- return ( call.status == 200 );
+ if ( call.status == 200 ) {
+ FlaggedRevsReview.isUserReviewing = value;
+ return true;
+ } else {
+ return false;
+ }
}
};
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
