From: jenkins-bot Date: Wed, 19 Jul 2017 02:52:26 +0000 (+0000) Subject: Merge "RCFilters: Emphasize UI when saved query is loaded" X-Git-Tag: 1.31.0-rc.0~2670 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/bilan.php?a=commitdiff_plain;h=e54511ae37c0b6a0a8ef8fe328cf0825f0e1ebfb;hp=d06a41928a70ef3bd5d36800acab0229d3c0f90a;p=lhc%2Fweb%2Fwiklou.git Merge "RCFilters: Emphasize UI when saved query is loaded" --- diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less index 420bb4433e..7ee601fb9a 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less @@ -1,3 +1,5 @@ +@import 'mediawiki.mixins'; + .mw-rcfilters-ui-filterTagMultiselectWidget { max-width: none; @@ -17,6 +19,14 @@ margin-top: 1.6em; } + .oo-ui-tagMultiselectWidget.oo-ui-widget-enabled &-animate.oo-ui-tagMultiselectWidget-handle { + .transition( background-color 500ms ease-out ); + } + + .oo-ui-tagMultiselectWidget.oo-ui-widget-enabled &-emphasize.oo-ui-tagMultiselectWidget-handle { + background-color: #eaf3ff; // Accent90 + } + &-wrapper { .mw-rcfilters-ui-table { margin-top: 0.3em; @@ -29,7 +39,8 @@ } &-savedQueryTitle { - color: #72777d; + color: #222; // Base10 + font-weight: bold; margin-left: 1em; } } diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js index 6da97c878d..6a6790fba8 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js @@ -381,6 +381,10 @@ !this.isEmpty() && !this.matchingQuery ); + + if ( this.matchingQuery ) { + this.emphasize(); + } } }; @@ -595,6 +599,26 @@ } }; + mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.emphasize = function () { + if ( + !this.$handle.hasClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-animate' ) + ) { + this.$handle + .addClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-emphasize' ) + .addClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-animate' ); + + setTimeout( function () { + this.$handle + .removeClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-emphasize' ); + + setTimeout( function () { + this.$handle + .removeClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-animate' ); + }.bind( this ), 1000 ); + }.bind( this ), 500 ); + + } + }; /** * Scroll the element to top within its container * 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 1e2ec8174f..9b4ce7fa47 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js @@ -68,7 +68,6 @@ this.$element.append( this.savedLinksListWidget.$element ); - } $bottom = $( '
' ) diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js index 3b5e7d9eae..27a21d693c 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js @@ -86,6 +86,8 @@ /* Initialization */ OO.inheritClass( mw.rcfilters.ui.SavedLinksListWidget, OO.ui.Widget ); + /* Methods */ + /** * Respond to menu item click event *