http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98082
Revision: 98082
Author: aaron
Date: 2011-09-25 20:28:56 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
* Removed references to FlaggedRevs JS object in PHP. Set event handlers all in
JS.
* Removed some logToggle JS duplication.
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php
trunk/extensions/FlaggedRevs/presentation/FlaggedRevsXML.php
trunk/extensions/FlaggedRevs/presentation/modules/flaggedrevs.js
Modified: trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php
2011-09-25 20:13:07 UTC (rev 98081)
+++ trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php
2011-09-25 20:28:56 UTC (rev 98082)
@@ -364,12 +364,9 @@
} else {
$this->showDraftVersion( $srev, $tag, $prot );
}
- $encJS = ''; // JS events to use
# Some checks for which tag CSS to use
if ( $this->useSimpleUI() ) {
$tagClass = 'flaggedrevs_short';
- # Collapse the box details on mouseOut
- $encJS .= '
onmouseout="FlaggedRevs.onBoxMouseOut(event)"';
} elseif ( $pristine ) {
$tagClass = 'flaggedrevs_pristine';
} elseif ( $quality ) {
@@ -380,7 +377,7 @@
# Wrap tag contents in a div
if ( $tag != '' ) {
$css = "{$tagClass} plainlinks noprint";
- $notice = "<div id=\"mw-fr-revisiontag\"
class=\"{$css}\"{$encJS}>{$tag}</div>\n";
+ $notice = "<div id=\"mw-fr-revisiontag\"
class=\"{$css}\">{$tag}</div>\n";
$this->reviewNotice .= $notice;
}
return true;
Modified: trunk/extensions/FlaggedRevs/presentation/FlaggedRevsXML.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/FlaggedRevsXML.php
2011-09-25 20:13:07 UTC (rev 98081)
+++ trunk/extensions/FlaggedRevs/presentation/FlaggedRevsXML.php
2011-09-25 20:28:56 UTC (rev 98082)
@@ -290,7 +290,6 @@
$encPath = htmlspecialchars( FlaggedRevs::styleUrlPath() .
'/img' );
$img = '<img id="mw-fr-revisiontoggle" class="fr-toggle-arrow"';
$img .= " src=\"{$encPath}/arrow-down.png\"
style=\"display:none;\"";
- $img .= ' onmouseover="FlaggedRevs.onBoxMouseOver()"';
$img .= ' alt="' . wfMsgHtml( 'revreview-toggle-title' ) . '"
/>';
return $img;
}
@@ -301,8 +300,7 @@
*/
public static function ratingToggle() {
return '<a id="mw-fr-revisiontoggle" class="fr-toggle-symbol"' .
- ' style="display:none;"
onclick="FlaggedRevs.toggleBoxDetails()" title="' .
- wfMsgHtml( 'revreview-toggle-title' ) . '" >' .
+ ' style="display:none;" title="' . wfMsgHtml(
'revreview-toggle-title' ) . '" >' .
wfMsgHtml( 'revreview-toggle-show' ) . '</a>';
}
@@ -311,8 +309,7 @@
* @return string
*/
public static function diffToggle() {
- $toggle = '<a class="fr-toggle-text" ' .
- ' onclick="FlaggedRevs.toggleDiff()" title="' .
+ $toggle = '<a class="fr-toggle-text" title="' .
wfMsgHtml( 'revreview-diff-toggle-title' ) . '" >' .
wfMsgHtml( 'revreview-diff-toggle-show' ) . '</a>';
return '<span id="mw-fr-difftoggle" style="display:none;">' .
@@ -324,11 +321,10 @@
* @return string
*/
public static function logToggle() {
- $toggle = '<a class="fr-toggle-text" ' .
- ' onclick="FlaggedRevs.toggleLog()" title="' .
+ $toggle = '<a class="fr-toggle-text" title="' .
wfMsgHtml( 'revreview-log-toggle-title' ) . '" >' .
wfMsgHtml( 'revreview-log-toggle-show' ) . '</a>';
- return '<span id="mw-fr-logtoggle" style="display:none;">' .
+ return '<span id="mw-fr-logtoggle" class="fr-logtoggle-excerpt"
style="display:none;">' .
wfMsgHtml( 'parentheses', $toggle ) . '</span>';
}
@@ -337,11 +333,10 @@
* @return string
*/
public static function logDetailsToggle() {
- $toggle = '<a class="fr-toggle-text" ' .
- ' onclick="FlaggedRevs.toggleLogDetails()" title="' .
+ $toggle = '<a class="fr-toggle-text" title="' .
wfMsgHtml( 'revreview-log-details-title' ) . '" >' .
wfMsgHtml( 'revreview-log-details-show' ) . '</a>';
- return '<span id="mw-fr-logtoggle" style="display:none;">' .
+ return '<span id="mw-fr-logtoggle" class="fr-logtoggle-details"
style="display:none;">' .
wfMsgHtml( 'parentheses', $toggle ) . '</span>';
}
Modified: trunk/extensions/FlaggedRevs/presentation/modules/flaggedrevs.js
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/modules/flaggedrevs.js
2011-09-25 20:13:07 UTC (rev 98081)
+++ trunk/extensions/FlaggedRevs/presentation/modules/flaggedrevs.js
2011-09-25 20:28:56 UTC (rev 98082)
@@ -14,21 +14,31 @@
var toggle = $('#mw-fr-revisiontoggle');
if ( toggle.length ) {
toggle.css('display','inline'); /* show toggle control
*/
- this.hideBoxDetails(); /* hide the initially displayed
ratings */
+ FlaggedRevs.hideBoxDetails(); /* hide the initially
displayed ratings */
}
- // Enables diff detail box
+ // Bar UI: Toggle the box when the toggle is clicked
+ $('.fr-toggle-symbol#mw-fr-revisiontoggle').click(
FlaggedRevs.toggleBoxDetails );
+ // Simple UI: Show the box on mouseOver
+ $('.fr-toggle-arrow#mw-fr-revisiontoggle').mouseover(
FlaggedRevs.onBoxMouseOver );
+ $('.flaggedrevs_short#mw-fr-revisiontag').mouseout(
FlaggedRevs.onBoxMouseOut );
+
+ // Enables diff detail box and toggle
toggle = $('#mw-fr-difftoggle');
if ( toggle.length ) {
toggle.css('display','inline'); /* show toggle control
*/
$('#mw-fr-stablediff').hide();
}
- // Enables log detail box
+ toggle.children('a').click( FlaggedRevs.toggleDiff );
+
+ // Enables log detail box and toggle
toggle = $('#mw-fr-logtoggle');
if ( toggle.length ) {
toggle.css('display','inline'); /* show toggle control
*/
$('#mw-fr-logexcerpt').hide();
}
- // Enables changing of save button when "review this" checkbox
changes */
+ toggle.children('a').click( FlaggedRevs.toggleLog );
+
+ // Enables changing of save button when "review this" checkbox
changes
$('#wpReviewEdit').click( FlaggedRevs.updateSaveButton );
},
@@ -49,11 +59,11 @@
if ( toggle.length && ratings.length ) {
// Collapsed -> expand
if ( ratings.css('display') == 'none' ) {
- this.showBoxDetails();
+ FlaggedRevs.showBoxDetails();
toggle.text( mw.msg('revreview-toggle-hide') );
// Expanded -> collapse
} else {
- this.hideBoxDetails();
+ FlaggedRevs.hideBoxDetails();
toggle.text( mw.msg('revreview-toggle-show') );
}
}
@@ -61,15 +71,15 @@
/* Expands flag info box details on mouseOver */
'onBoxMouseOver': function( event ) {
- window.clearTimeout( this.boxCollapseTimer );
- this.boxCollapseTimer = null;
- this.showBoxDetails();
+ window.clearTimeout( FlaggedRevs.boxCollapseTimer );
+ FlaggedRevs.boxCollapseTimer = null;
+ FlaggedRevs.showBoxDetails();
},
/* Hides flag info box details on mouseOut *except* for event bubbling
*/
'onBoxMouseOut': function( event ) {
- if ( !this.isMouseOutBubble( event, 'mw-fr-revisiontag' ) ) {
- this.boxCollapseTimer = window.setTimeout(
this.hideBoxDetails, 150 );
+ if ( !FlaggedRevs.isMouseOutBubble( event, 'mw-fr-revisiontag'
) ) {
+ FlaggedRevs.boxCollapseTimer = window.setTimeout(
FlaggedRevs.hideBoxDetails, 150 );
}
},
@@ -113,27 +123,20 @@
var log = $('#mw-fr-logexcerpt');
var toggle = $('#mw-fr-logtoggle');
if ( log.length && toggle.length ) {
- if ( log.css('display') == 'none' ) {
- log.show();
- toggle.children('a').text(
mw.msg('revreview-log-toggle-hide') );
+ // Two different message sets used here...
+ if ( toggle.hasClass('fr-logtoggle-details') ) {
+ var hideMsg =
mw.msg('revreview-log-details-hide');
+ var showMsg =
mw.msg('revreview-log-details-show');
} else {
- log.hide();
- toggle.children('a').text(
mw.msg('revreview-log-toggle-show') );
+ var hideMsg =
mw.msg('revreview-log-toggle-hide');
+ var showMsg =
mw.msg('revreview-log-toggle-show');
}
- }
- },
-
- /* Toggles log excerpts */
- 'toggleLogDetails': function() {
- var log = $('#mw-fr-logexcerpt');
- var toggle = $('#mw-fr-logtoggle');
- if ( log.length && toggle.length ) {
if ( log.css('display') == 'none' ) {
log.show();
- toggle.children('a').text(
mw.msg('revreview-log-details-hide') );
+ toggle.children('a').text( hideMsg );
} else {
log.hide();
- toggle.children('a').text(
mw.msg('revreview-log-details-show') );
+ toggle.children('a').text( showMsg );
}
}
},
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
