Mooeypoo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/361712 )
Change subject: Special:RecentChanges - Move legend into results
......................................................................
Special:RecentChanges - Move legend into results
** This affects all RecentChanges pages, not just RCFilters **
Move the legend from the fieldset area to the results area.
Bug: T168043
Change-Id: I40454b194fe3975d8d4ac13d96774bfa5b5d5a46
---
M includes/specials/SpecialRecentchanges.php
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
3 files changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/12/361712/1
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index 5ec2064..662eaa3 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -521,6 +521,7 @@
$userShowHiddenCats = $this->getUser()->getBoolOption(
'showhiddencats' );
$rclistOutput = $list->beginRecentChangesList();
+ $rclistOutput .= $this->makeLegend();
foreach ( $rows as $obj ) {
if ( $limit == 0 ) {
break;
@@ -588,7 +589,7 @@
$nondefaults = $opts->getChangedValues();
$panel = [];
- $panel[] = $this->makeLegend();
+ // $panel[] = $this->makeLegend();
$panel[] = $this->optionsPanel( $defaults, $nondefaults,
$numRows );
$panel[] = '<hr />';
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index c7754be..bb29f08 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -92,7 +92,8 @@
var conflictItem,
$message = $( '<div>' )
.addClass(
'mw-rcfilters-ui-changesListWrapperWidget-results' ),
- isEmpty = $changesListContent === 'NO_RESULTS';
+ isEmpty = $changesListContent === 'NO_RESULTS',
+ collapseCookieName = 'changeslist-state';
this.$element.toggleClass( 'mw-changeslist', !isEmpty );
if ( isEmpty ) {
@@ -130,6 +131,19 @@
// Apply highlight
this.applyHighlight();
+ // Collapse legend
+ // see
resources/src/mediawiki.special/mediawiki.special.changelist.legend.js
+ this.$element.find( '.mw-changeslist-legend' )
+ .makeCollapsible( {
+ collapsed: mw.cookie.get(
collapseCookieName ) === 'collapsed'
+ } )
+ .on( 'beforeExpand.mw-collapsible', function ()
{
+ mw.cookie.set( collapseCookieName,
'expanded' );
+ } )
+ .on( 'beforeCollapse.mw-collapsible', function
() {
+ mw.cookie.set( collapseCookieName,
'collapsed' );
+ } );
+
// Make sure enhanced RC re-initializes correctly
mw.hook( 'wikipage.content' ).fire( this.$element );
}
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
index 4e1ae97..2258312 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
@@ -117,8 +117,7 @@
* Clean up the old-style show/hide that we have implemented in the
filter list
*/
mw.rcfilters.ui.FormWrapperWidget.prototype.cleanUpFieldset = function
() {
- var $namespaceSelect = this.$element.find( '#namespace' ),
- collapseCookieName = 'changeslist-state';
+ var $namespaceSelect = this.$element.find( '#namespace' );
this.$element.find(
'.rcshowhideoption[data-feature-in-structured-ui=1]' ).each( function () {
// HACK: Remove the text node after the span.
@@ -138,19 +137,5 @@
$namespaceSelect.closest( 'tr' ).detach();
this.$element.find( '.mw-tagfilter-label' ).closest(
'tr' ).detach();
}
-
- // Collapse legend
- // see
resources/src/mediawiki.special/mediawiki.special.changelist.legend.js
- this.$element.find( '.mw-changeslist-legend' )
- .makeCollapsible( {
- collapsed: mw.cookie.get( collapseCookieName )
=== 'collapsed'
- } )
- .on( 'beforeExpand.mw-collapsible', function () {
- mw.cookie.set( collapseCookieName, 'expanded' );
- } )
- .on( 'beforeCollapse.mw-collapsible', function () {
- mw.cookie.set( collapseCookieName, 'collapsed'
);
- } );
-
};
}( mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/361712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40454b194fe3975d8d4ac13d96774bfa5b5d5a46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <mor...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
