Mooeypoo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/341463 )
Change subject: RCFilters UI: Unify the loader animation
......................................................................
RCFilters UI: Unify the loader animation
Bug: T159766
Change-Id: Ifda7510efa4e16422b5988c37c2e54aa08b52b71
---
M includes/specials/SpecialRecentchanges.php
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
5 files changed, 24 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/63/341463/1
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index cdad926..eb29907 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -456,23 +456,30 @@
$panel[] = $form;
$panelString = implode( "\n", $panel );
+ $rcoptions = Xml::fieldset(
+ $this->msg( 'recentchanges-legend' )->text(),
+ $panelString,
+ [ 'class' => 'rcoptions' ]
+ );
+
// Insert a placeholder for RCFilters
if ( $this->getUser()->getOption( 'rcenhancedfilters' ) ) {
+ $rcfilterContainer = Html::element(
+ 'div',
+ [ 'class' => 'rcfilters-container' ]
+ );
+
+ // Wrap both with rcfilters-head
$this->getOutput()->addHTML(
- Html::element(
+ Html::rawElement(
'div',
- [ 'class' => 'rcfilters-container' ]
+ [ 'class' => 'rcfilters-head' ],
+ $rcfilterContainer . $rcoptions
)
);
+ } else {
+ $this->getOutput()->addHTML( $rcoptions );
}
-
- $this->getOutput()->addHTML(
- Xml::fieldset(
- $this->msg( 'recentchanges-legend' )->text(),
- $panelString,
- [ 'class' => 'rcoptions' ]
- )
- );
$this->setBottomText( $opts );
}
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 089b106..255d93b 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -189,6 +189,9 @@
$( '.rcfilters-container' ).append(
filtersWidget.$element );
$( 'body' ).append( $overlay );
+ // Set as ready
+ $( '.rcfilters-head' ).addClass(
'mw-rcfilters-ui-ready' );
+
window.addEventListener( 'popstate', function () {
controller.updateChangesList();
} );
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index 897a9e8..d47346c 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -7,7 +7,10 @@
legend {
display: none;
}
+ }
+ .rcfilters-head {
+ min-height: 270px;
&:not( .mw-rcfilters-ui-ready ) {
/* @embed */
background-image: url( ../images/pending.gif );
@@ -22,11 +25,6 @@
.rcfilters-container {
min-height: 100px;
margin: 0;
-
- &:not( .mw-rcfilters-ui-ready ) {
- /* @embed */
- background-image: url( ../images/pending.gif );
- }
}
}
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index 886dc43..de7ea74 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -75,7 +75,6 @@
// Initialize
this.$element
.addClass( 'mw-rcfilters-ui-filterWrapperWidget' )
- .addClass( 'mw-rcfilters-ui-ready' )
.append( this.capsule.$element, this.textInput.$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 51311e1..e914bbe 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
@@ -42,8 +42,7 @@
// Initialize
this.cleanUpFieldset();
this.$element
- .addClass( 'mw-rcfilters-ui-FormWrapperWidget' )
- .addClass( 'mw-rcfilters-ui-ready' );
+ .addClass( 'mw-rcfilters-ui-FormWrapperWidget' );
};
/* Initialization */
--
To view, visit https://gerrit.wikimedia.org/r/341463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifda7510efa4e16422b5988c37c2e54aa08b52b71
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
