Sbisson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372550 )
Change subject: WLFilters: correctly detect and show no_results message
......................................................................
WLFilters: correctly detect and show no_results message
Also adjust selectors to hide legacy options panel
while the app is loading.
Change-Id: I8cd2c5eaee9a9f4ef3e056c22c00b6bf0bf93833
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
2 files changed, 14 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/50/372550/1
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index b736d25..c24e6c6 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -1154,23 +1154,31 @@
return $.ajax( uri.toString(), { contentType: 'html' } )
.then(
- // Success
function ( html ) {
- var $parsed;
+ var $parsed,
+ pieces;
+
if ( !latestRequest() ) {
return $.Deferred().reject();
}
$parsed = $( $.parseHTML( html ) );
- return {
+ pieces = {
// Changes list
changes: $parsed.find(
'.mw-changeslist' ).first().contents(),
// Fieldset
fieldset: $parsed.find(
'fieldset.cloptions' ).first()
};
+
+ // Watchlist returns 200 when there is
no results
+ if ( pieces.changes.length === 0 ) {
+ pieces.changes = 'NO_RESULTS';
+ }
+
+ return pieces;
},
- // Failure
+ // RC returns 404 when there is no results
function ( responseObj ) {
var $parsed;
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index ef29655..d5528e1 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -3,7 +3,7 @@
// Corrections for the standard special page
.client-js {
- .rcoptions {
+ .cloptions {
border: 0;
}
@@ -38,7 +38,7 @@
opacity: 0.5;
pointer-events: none;
- .rcoptions {
+ .cloptions {
display: none;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/372550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cd2c5eaee9a9f4ef3e056c22c00b6bf0bf93833
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
