jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI Class Names (549ff9ab7d) ......................................................................
Update OOjs UI Class Names (549ff9ab7d) Changes were generated by running this script: https://gist.github.com/trevorparscal/92ccdc4c49ab033d9ba8 File content changes: Scripts (*.js) - TextInputMenuWidget → TextInputMenuSelectWidget - MenuWidget → MenuSelectWidget - MenuItemWidget → MenuOptionWidget - MenuSectionItemWidget → MenuSectionOptionWidget - OutlineWidget → OutlineSelectWidget - OutlineItemWidget → OutlineOptionWidget Styles (*.less) - textInputMenuWidget → textInputMenuSelectWidget - menuWidget → menuSelectWidget - menuItemWidget → menuOptionWidget - menuSectionItemWidget → menuSectionOptionWidget - outlineWidget → outlineSelectWidget - outlineItemWidget → outlineOptionWidget Change-Id: I19ad3990837c0c565773fbb4c3d9d4d18e5f616e --- M docs/external.js M resources/mmv/logging/mmv.logging.AttributionLogger.js M resources/mmv/logging/mmv.logging.DimensionLogger.js M resources/mmv/mmv.mixins.less M resources/mmv/ui/mmv.ui.download.pane.js M resources/mmv/ui/mmv.ui.download.pane.less M resources/mmv/ui/mmv.ui.reuse.dialog.js M resources/mmv/ui/mmv.ui.reuse.embed.js M resources/mmv/ui/mmv.ui.reuse.shareembed.less M resources/mmv/ui/mmv.ui.truncatableTextField.less M resources/mmv/ui/mmv.ui.utils.js M tests/browser/features/support/pages/e2e_test_page.rb 12 files changed, 25 insertions(+), 25 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/external.js b/docs/external.js index ab2cca4..ff415ee 100644 --- a/docs/external.js +++ b/docs/external.js @@ -37,13 +37,13 @@ */ /** - * @class OO.ui.MenuItemWidget - * <https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/OO.ui.MenuItemWidget> + * @class OO.ui.MenuOptionWidget + * <https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/OO.ui.MenuOptionWidget> */ /** - * @class OO.ui.MenuWidget - * <https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/OO.ui.MenuWidget> + * @class OO.ui.MenuSelectWidget + * <https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/OO.ui.MenuSelectWidget> */ /** diff --git a/resources/mmv/logging/mmv.logging.AttributionLogger.js b/resources/mmv/logging/mmv.logging.AttributionLogger.js index 9519a48..330ef30 100644 --- a/resources/mmv/logging/mmv.logging.AttributionLogger.js +++ b/resources/mmv/logging/mmv.logging.AttributionLogger.js @@ -65,4 +65,4 @@ mw.mmv.logging.AttributionLogger = AttributionLogger; mw.mmv.attributionLogger = new AttributionLogger(); -}( mediaWiki, jQuery, OO ) ); \ No newline at end of file +}( mediaWiki, jQuery, OO ) ); diff --git a/resources/mmv/logging/mmv.logging.DimensionLogger.js b/resources/mmv/logging/mmv.logging.DimensionLogger.js index 22a58d0..0ef81eb 100644 --- a/resources/mmv/logging/mmv.logging.DimensionLogger.js +++ b/resources/mmv/logging/mmv.logging.DimensionLogger.js @@ -73,4 +73,4 @@ mw.mmv.logging.DimensionLogger = DimensionLogger; mw.mmv.dimensionLogger = new DimensionLogger(); -}( mediaWiki, jQuery, OO ) ); \ No newline at end of file +}( mediaWiki, jQuery, OO ) ); diff --git a/resources/mmv/mmv.mixins.less b/resources/mmv/mmv.mixins.less index a63e6f6..fa037a1 100644 --- a/resources/mmv/mmv.mixins.less +++ b/resources/mmv/mmv.mixins.less @@ -73,4 +73,4 @@ filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale"); /* Firefox 3.5+ */ filter: grayscale(100%); filter: gray; // IE 6-9 -} \ No newline at end of file +} diff --git a/resources/mmv/ui/mmv.ui.download.pane.js b/resources/mmv/ui/mmv.ui.download.pane.js index 35cfab6..66919a7 100644 --- a/resources/mmv/ui/mmv.ui.download.pane.js +++ b/resources/mmv/ui/mmv.ui.download.pane.js @@ -51,7 +51,7 @@ /** * Default item for the size menu. - * @property {OO.ui.MenuItemWidget} + * @property {OO.ui.MenuOptionWidget} */ this.defaultItem = this.downloadSizeMenu.getMenu().getSelectedItem(); @@ -260,7 +260,7 @@ /** * Handles size menu change events. * - * @param {OO.ui.MenuItemWidget} item + * @param {OO.ui.MenuOptionWidget} item */ DP.handleSizeSwitch = function ( item ) { var download = this, diff --git a/resources/mmv/ui/mmv.ui.download.pane.less b/resources/mmv/ui/mmv.ui.download.pane.less index 1c3d665..43e9631 100644 --- a/resources/mmv/ui/mmv.ui.download.pane.less +++ b/resources/mmv/ui/mmv.ui.download.pane.less @@ -94,7 +94,7 @@ display: none; } - .oo-ui-menuItemWidget { + .oo-ui-menuOptionWidget { display: block; } diff --git a/resources/mmv/ui/mmv.ui.reuse.dialog.js b/resources/mmv/ui/mmv.ui.reuse.dialog.js index e26bb1c..1b4ce4e 100644 --- a/resources/mmv/ui/mmv.ui.reuse.dialog.js +++ b/resources/mmv/ui/mmv.ui.reuse.dialog.js @@ -36,7 +36,7 @@ this.tabs = null; /** - * @property {Object.<string, OO.ui.MenuItemWidget>} ooTabs List of tab OOJS UI objects. + * @property {Object.<string, OO.ui.MenuOptionWidget>} ooTabs List of tab OOJS UI objects. */ this.ooTabs = null; @@ -54,16 +54,16 @@ // FIXME this should happen outside the dialog and the tabs, but we need to improve DP.initTabs = function () { function makeTab( type ) { - return new oo.ui.MenuItemWidget( type, { + return new oo.ui.MenuOptionWidget( type, { label: mw.message( 'multimediaviewer-' + type + '-tab' ).text() } ); } - this.reuseTabs = new oo.ui.MenuWidget( { + this.reuseTabs = new oo.ui.MenuSelectWidget( { classes: [ 'mw-mmv-reuse-tabs' ] } ); - // MenuWidget has a nasty tendency to hide itself, maybe we're not using it right? + // MenuSelectWidget has a nasty tendency to hide itself, maybe we're not using it right? this.reuseTabs.hide = $.noop; this.reuseTabs.$element.show().appendTo( this.$dialog ); diff --git a/resources/mmv/ui/mmv.ui.reuse.embed.js b/resources/mmv/ui/mmv.ui.reuse.embed.js index be0702d..824f4b7 100644 --- a/resources/mmv/ui/mmv.ui.reuse.embed.js +++ b/resources/mmv/ui/mmv.ui.reuse.embed.js @@ -68,25 +68,25 @@ /** * Default item for the html size menu. - * @property {OO.ui.MenuItemWidget} + * @property {OO.ui.MenuOptionWidget} */ this.defaultHtmlItem = this.embedSizeSwitchHtml.getMenu().getSelectedItem(); /** * Default item for the wikitext size menu. - * @property {OO.ui.MenuItemWidget} + * @property {OO.ui.MenuOptionWidget} */ this.defaultWikitextItem = this.embedSizeSwitchWikitext.getMenu().getSelectedItem(); /** * Currently selected size menu. - * @property {OO.ui.MenuWidget} + * @property {OO.ui.MenuSelectWidget} */ this.currentSizeMenu = mw.user.isAnon() ? this.embedSizeSwitchHtml.getMenu() : this.embedSizeSwitchWikitext.getMenu(); /** * Current default item. - * @property {OO.ui.MenuItemWidget} + * @property {OO.ui.MenuOptionWidget} */ this.currentDefaultItem = mw.user.isAnon() ? this.defaultHtmlItem : this.defaultWikitextItem; } @@ -262,7 +262,7 @@ /** * Handles size menu change events. * - * @param {OO.ui.MenuItemWidget} item + * @param {OO.ui.MenuOptionWidget} item */ EP.handleSizeSwitch = function ( item ) { var value = item.getData(); @@ -273,7 +273,7 @@ /** * Handles snippet type switch. * - * @param {OO.ui.MenuItemWidget} item + * @param {OO.ui.MenuOptionWidget} item */ EP.handleTypeSwitch = function ( item ) { var value = item.getData(); diff --git a/resources/mmv/ui/mmv.ui.reuse.shareembed.less b/resources/mmv/ui/mmv.ui.reuse.shareembed.less index 3a166e1..1a59e5d 100644 --- a/resources/mmv/ui/mmv.ui.reuse.shareembed.less +++ b/resources/mmv/ui/mmv.ui.reuse.shareembed.less @@ -5,4 +5,4 @@ font-size: 0.9em; margin-left: 1.5em; padding: 5px 8px; -} \ No newline at end of file +} diff --git a/resources/mmv/ui/mmv.ui.truncatableTextField.less b/resources/mmv/ui/mmv.ui.truncatableTextField.less index fc401fd..583e600 100644 --- a/resources/mmv/ui/mmv.ui.truncatableTextField.less +++ b/resources/mmv/ui/mmv.ui.truncatableTextField.less @@ -72,4 +72,4 @@ .fade-out-horizontal(); } } -} \ No newline at end of file +} diff --git a/resources/mmv/ui/mmv.ui.utils.js b/resources/mmv/ui/mmv.ui.utils.js index 1c0269a..492689f 100644 --- a/resources/mmv/ui/mmv.ui.utils.js +++ b/resources/mmv/ui/mmv.ui.utils.js @@ -50,7 +50,7 @@ for ( i = 0; i < options.length; i++ ) { option = options[ i ]; - choices[option] = new oo.ui.MenuItemWidget( + choices[option] = new oo.ui.MenuOptionWidget( { // Customized data injected in each item name: option, height: null, @@ -94,7 +94,7 @@ * Updates the menu options based on calculated sizes. * * @param {Object} sizes - * @param {OO.ui.MenuItemWidget[]} options + * @param {OO.ui.MenuOptionWidget[]} options */ RUP.updateMenuOptions = function ( sizes, options ) { var i, option, data, $label; diff --git a/tests/browser/features/support/pages/e2e_test_page.rb b/tests/browser/features/support/pages/e2e_test_page.rb index 7a85d8a..67e8c1e 100644 --- a/tests/browser/features/support/pages/e2e_test_page.rb +++ b/tests/browser/features/support/pages/e2e_test_page.rb @@ -47,7 +47,7 @@ div(:mmv_download_size_menu) do |page| page.mmv_download_size_menu_container_element.div_element(class: "oo-ui-selectWidget") end - divs(:mmv_download_size_options, class: "oo-ui-menuItemWidget") + divs(:mmv_download_size_options, class: "oo-ui-menuOptionWidget") a(:mmv_download_link, class: "mw-mmv-download-go-button") a(:mmv_download_preview_link, class: "mw-mmv-download-preview-link") div(:mmv_download_attribution_area, class: "mw-mmv-download-attribution") -- To view, visit https://gerrit.wikimedia.org/r/173987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I19ad3990837c0c565773fbb4c3d9d4d18e5f616e Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Trevor Parscal <[email protected]> Gerrit-Reviewer: Gergő Tisza <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
