From 8af6e14a954cbcdac59634516c3c332a1896415d Mon Sep 17 00:00:00 2001 From: Moriel Schottlender Date: Tue, 30 May 2017 13:55:59 +0300 Subject: [PATCH] RCFilters UI: Migrate FloatingMenuSelectWidget to MenuSelectWidget FloatingMenuSelectWidget has been deprecated in OOUI, moving to the MenuSelectWidget widget instead. Change-Id: Id4e5e4c551d50242ce19837c2e958b9773139906 --- resources/Resources.php | 4 +-- ... => mw.rcfilters.ui.MenuSelectWidget.less} | 2 +- ...rcfilters.ui.FilterTagMultiselectWidget.js | 2 +- ...js => mw.rcfilters.ui.MenuSelectWidget.js} | 26 +++++++++---------- ...w.rcfilters.ui.SavedLinksListItemWidget.js | 4 +-- 5 files changed, 19 insertions(+), 19 deletions(-) rename resources/src/mediawiki.rcfilters/styles/{mw.rcfilters.ui.FloatingMenuSelectWidget.less => mw.rcfilters.ui.MenuSelectWidget.less} (89%) rename resources/src/mediawiki.rcfilters/ui/{mw.rcfilters.ui.FloatingMenuSelectWidget.js => mw.rcfilters.ui.MenuSelectWidget.js} (71%) diff --git a/resources/Resources.php b/resources/Resources.php index 976b1fb4e2..9e0418caf4 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1764,7 +1764,7 @@ return [ 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js', 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagItemWidget.js', 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js', - 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FloatingMenuSelectWidget.js', + 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js', 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js', 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js', 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js', @@ -1787,7 +1787,7 @@ return [ 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuSectionOptionWidget.less', 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.TagItemWidget.less', 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuHeaderWidget.less', - 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FloatingMenuSelectWidget.less', + 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.MenuSelectWidget.less', 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less', 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less', 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less', diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FloatingMenuSelectWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.MenuSelectWidget.less similarity index 89% rename from resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FloatingMenuSelectWidget.less rename to resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.MenuSelectWidget.less index 67823c9a59..2dd43a8611 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FloatingMenuSelectWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.MenuSelectWidget.less @@ -1,6 +1,6 @@ @import 'mediawiki.mixins'; -.mw-rcfilters-ui-floatingMenuSelectWidget { +.mw-rcfilters-ui-menuSelectWidget { z-index: auto; max-width: 650px; 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 78f3a083d3..05cd24f55c 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js @@ -422,7 +422,7 @@ * @inheritdoc */ mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.createMenuWidget = function ( menuConfig ) { - return new mw.rcfilters.ui.FloatingMenuSelectWidget( + return new mw.rcfilters.ui.MenuSelectWidget( this.controller, this.model, $.extend( { diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FloatingMenuSelectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js similarity index 71% rename from resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FloatingMenuSelectWidget.js rename to resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js index d98ef2d060..0dfbb4d1bb 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FloatingMenuSelectWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js @@ -2,7 +2,7 @@ /** * A floating menu widget for the filter list * - * @extends OO.ui.FloatingMenuSelectWidget + * @extends OO.ui.MenuSelectWidget * * @constructor * @param {mw.rcfilters.Controller} controller Controller @@ -11,7 +11,7 @@ * @cfg {jQuery} [$overlay] A jQuery object serving as overlay for popups * @cfg {jQuery} [$footer] An optional footer for the menu */ - mw.rcfilters.ui.FloatingMenuSelectWidget = function MwRcfiltersUiFloatingMenuSelectWidget( controller, model, config ) { + mw.rcfilters.ui.MenuSelectWidget = function MwRcfiltersUiMenuSelectWidget( controller, model, config ) { var header; config = config || {}; @@ -23,16 +23,16 @@ this.$overlay = config.$overlay || this.$element; this.$footer = config.$footer; this.$body = $( '
' ) - .addClass( 'mw-rcfilters-ui-floatingMenuSelectWidget-body' ); + .addClass( 'mw-rcfilters-ui-menuSelectWidget-body' ); // Parent - mw.rcfilters.ui.FloatingMenuSelectWidget.parent.call( this, $.extend( { + mw.rcfilters.ui.MenuSelectWidget.parent.call( this, $.extend( { $autoCloseIgnore: this.$overlay, width: 650 }, config ) ); this.setGroupElement( $( '
' ) - .addClass( 'mw-rcfilters-ui-floatingMenuSelectWidget-group' ) + .addClass( 'mw-rcfilters-ui-menuSelectWidget-group' ) ); this.setClippableElement( this.$body ); this.setClippableContainer( this.$element ); @@ -47,11 +47,11 @@ this.noResults = new OO.ui.LabelWidget( { label: mw.msg( 'rcfilters-filterlist-noresults' ), - classes: [ 'mw-rcfilters-ui-floatingMenuSelectWidget-noresults' ] + classes: [ 'mw-rcfilters-ui-menuSelectWidget-noresults' ] } ); this.$element - .addClass( 'mw-rcfilters-ui-floatingMenuSelectWidget' ) + .addClass( 'mw-rcfilters-ui-menuSelectWidget' ) .append( header.$element ) .append( this.$body @@ -61,14 +61,14 @@ if ( this.$footer ) { this.$element.append( this.$footer - .addClass( 'mw-rcfilters-ui-floatingMenuSelectWidget-footer' ) + .addClass( 'mw-rcfilters-ui-menuSelectWidget-footer' ) ); } }; /* Initialize */ - OO.inheritClass( mw.rcfilters.ui.FloatingMenuSelectWidget, OO.ui.FloatingMenuSelectWidget ); + OO.inheritClass( mw.rcfilters.ui.MenuSelectWidget, OO.ui.MenuSelectWidget ); /* Events */ @@ -84,7 +84,7 @@ * @fires itemVisibilityChange * @inheritdoc */ - mw.rcfilters.ui.FloatingMenuSelectWidget.prototype.updateItemVisibility = function () { + mw.rcfilters.ui.MenuSelectWidget.prototype.updateItemVisibility = function () { var i, itemWasHighlighted = false, inputVal = this.$input.val(), @@ -94,7 +94,7 @@ // call it unless the input actually changed if ( this.inputValue !== inputVal ) { // Parent method - mw.rcfilters.ui.FloatingMenuSelectWidget.parent.prototype.updateItemVisibility.call( this ); + mw.rcfilters.ui.MenuSelectWidget.parent.prototype.updateItemVisibility.call( this ); if ( inputVal !== '' ) { // Highlight the first item in the list @@ -126,7 +126,7 @@ * * @inheritdoc */ - mw.rcfilters.ui.FloatingMenuSelectWidget.prototype.getItemMatcher = function ( s ) { + mw.rcfilters.ui.MenuSelectWidget.prototype.getItemMatcher = function ( s ) { var results = this.model.findMatches( s, true ); return function ( item ) { @@ -137,7 +137,7 @@ /** * Scroll to the top of the menu */ - mw.rcfilters.ui.FloatingMenuSelectWidget.prototype.scrollToTop = function () { + mw.rcfilters.ui.MenuSelectWidget.prototype.scrollToTop = function () { this.$body.scrollTop( 0 ); }; }( mediaWiki ) ); diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js index acda29e12a..7ce9b6afff 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js @@ -41,12 +41,12 @@ icon: 'ellipsis', framed: false } ); - this.menu = new OO.ui.FloatingMenuSelectWidget( { + this.menu = new OO.ui.MenuSelectWidget( { classes: [ 'mw-rcfilters-ui-savedLinksListItemWidget-menu' ], widget: this.popupButton, width: 200, horizontalPosition: 'end', - $container: this.popupButton.$element, + $floatableContainer: this.popupButton.$element, items: [ new OO.ui.MenuOptionWidget( { data: 'edit', -- 2.20.1