Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/108044
Change subject: Update uses of Push/IconButtonWidget to ButtonWidget in MW ...................................................................... Update uses of Push/IconButtonWidget to ButtonWidget in MW Separated this commit form I325a4dcc316d0 as it is causing master to fail. Change-Id: I82220d15221c52be03feafcfc85c2bd6c12ba462 --- M modules/syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.js M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb M modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js M modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js M modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js M modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js M modules/ve-mw/ui/styles/ve.ui.MWDialog.css M modules/ve-mw/ui/styles/ve.ui.MWWidget.css M modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js M modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js 19 files changed, 44 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/44/108044/1 diff --git a/modules/syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.js b/modules/syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.js index 5b66662..07971f1 100644 --- a/modules/syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.js +++ b/modules/syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.js @@ -43,7 +43,7 @@ this.editPanel = new OO.ui.PanelLayout( { '$': this.$, 'scrollable': false, 'padded': false } ); - this.applyButton = new OO.ui.PushButtonWidget( { + this.applyButton = new OO.ui.ButtonWidget( { '$': this.$, 'label': ve.msg( 'visualeditor-dialog-action-apply' ), 'flags': ['primary'] } ); this.applyButton.connect( this, { 'click': [ 'close', { 'action': 'apply' } ] } ); diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css index 3f79c07..6abe4a8 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css +++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css @@ -42,12 +42,12 @@ padding: 0.25em; } -.ve-init-mw-viewPageTarget-toolbar-utilites > .oo-ui-iconButtonWidget { +.ve-init-mw-viewPageTarget-toolbar-utilites > .oo-ui-buttonedElement-frameless { margin-right: 0.2em; margin-top: 0.2em; } -.ve-init-mw-viewPageTarget-toolbar-actions > .oo-ui-pushButtonWidget { +.ve-init-mw-viewPageTarget-toolbar-actions > .oo-ui-buttonedElement-framed { margin-left: 0.25em; margin-right: 0.25em; margin-top: 0.2em; @@ -103,12 +103,12 @@ margin-top: 0.8em; } -.ve-ui-mwHelpPopupTool-item > .oo-ui-iconButtonWidget { +.ve-ui-mwHelpPopupTool-item > .oo-ui-buttonedElement-frameless { display: block; margin: 0.5em 0; } -.ve-ui-mwHelpPopupTool-item > .oo-ui-iconButtonWidget:first-child { +.ve-ui-mwHelpPopupTool-item > .oo-ui-buttonedElement-frameless:first-child { margin-top: 0; } diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js index 5d635a3..2bfcafc 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js @@ -968,9 +968,9 @@ * @method */ ve.init.mw.ViewPageTarget.prototype.setupToolbarButtons = function () { - this.toolbarCancelButton = new OO.ui.PushButtonWidget( { 'label': ve.msg( 'visualeditor-toolbar-cancel' ) } ); + this.toolbarCancelButton = new OO.ui.ButtonWidget( { 'label': ve.msg( 'visualeditor-toolbar-cancel' ) } ); this.toolbarCancelButton.$element.addClass( 've-ui-toolbar-cancelButton' ); - this.toolbarSaveButton = new OO.ui.PushButtonWidget( { + this.toolbarSaveButton = new OO.ui.ButtonWidget( { 'label': ve.msg( 'visualeditor-toolbar-savedialog' ), 'flags': ['constructive'], 'disabled': !this.restoring diff --git a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb index 02cc054..57ef5ba 100644 --- a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb +++ b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb @@ -4,7 +4,7 @@ include URL page_url URL.url("User:#{ENV['MEDIAWIKI_USER']}" + "/#{ENV['BROWSER_LABEL']}") - div(:container_disabled, class: "oo-ui-widget oo-ui-widget-disabled oo-ui-flaggableElement-constructive oo-ui-pushButtonWidget") + div(:container_disabled, class: "oo-ui-widget oo-ui-widget-disabled oo-ui-flaggableElement-constructive oo-ui-.oo-ui-buttonedElement-framed") div(:content, class: "ve-ce-documentNode ve-ce-branchNode") span(:decrease_indentation, class: "oo-ui-widget oo-ui-tool oo-ui-tool-name-outdent oo-ui-widget-disabled") a(:decrease_indentation_on, title: /Decrease indentation/) @@ -26,7 +26,7 @@ span(:paragraph, text: "Paragraph") span(:preformatted, text: "Preformatted") span(:refs_link, text: "Reference") - div(:save_disabled, class: "oo-ui-widget oo-ui-widget-disabled oo-ui-flaggableElement-constructive oo-ui-pushButtonWidget") + div(:save_disabled, class: "oo-ui-widget oo-ui-widget-disabled oo-ui-flaggableElement-constructive oo-ui-.oo-ui-buttonedElement-framed") span(:save_page, class: "oo-ui-labeledElement-label", text: "Save page") span(:subheading1, text: "Sub-heading 1") span(:subheading2, text: "Sub-heading 2") diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js index 41ac3e9..ece7a33 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js @@ -61,7 +61,7 @@ 'scrollable': true, 'padded': true } ); - this.continueButton = new OO.ui.PushButtonWidget( { + this.continueButton = new OO.ui.ButtonWidget( { '$': this.$, 'label': ve.msg( 'visualeditor-dialog-beta-welcome-action-continue' ), 'flags': ['primary'] diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js index 493e0a3..8d038e2 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js @@ -106,7 +106,7 @@ 'label': ve.msg( 'visualeditor-dialog-media-content-section' ), 'icon': 'parameter' } ); - this.applyButton = new OO.ui.PushButtonWidget( { + this.applyButton = new OO.ui.ButtonWidget( { '$': this.$, 'label': ve.msg( 'visualeditor-dialog-action-apply' ), 'flags': ['primary'] diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js index 55ebff7..162396c 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js @@ -43,7 +43,7 @@ // Properties this.bookletLayout = new OO.ui.BookletLayout( { '$': this.$, 'outlined': true } ); - this.applyButton = new OO.ui.PushButtonWidget( { + this.applyButton = new OO.ui.ButtonWidget( { '$': this.$, 'label': ve.msg( 'visualeditor-dialog-action-apply' ), 'flags': ['primary'] diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js index a9a46e7..ff5814c 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js @@ -185,21 +185,21 @@ '$': this.$, 'scrollable': true, 'padded': true } ); this.searchPanel = new OO.ui.PanelLayout( { '$': this.$ } ); - this.applyButton = new OO.ui.PushButtonWidget( { + this.applyButton = new OO.ui.ButtonWidget( { '$': this.$, 'label': ve.msg( 'visualeditor-dialog-action-apply' ), 'flags': ['primary'] } ); - this.insertButton = new OO.ui.PushButtonWidget( { + this.insertButton = new OO.ui.ButtonWidget( { '$': this.$, 'label': ve.msg( 'visualeditor-dialog-reference-insert-button' ), 'flags': ['constructive'] } ); - this.selectButton = new OO.ui.PushButtonWidget( { + this.selectButton = new OO.ui.ButtonWidget( { '$': this.$, 'label': ve.msg ( 'visualeditor-dialog-reference-useexisting-label' ) } ); - this.backButton = new OO.ui.PushButtonWidget( { + this.backButton = new OO.ui.ButtonWidget( { '$': this.$, 'label': ve.msg( 'visualeditor-dialog-action-goback' ) } ); diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js index 0012fb3..412d52d 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js @@ -58,7 +58,7 @@ 'label': ve.msg( 'visualeditor-dialog-reference-options-group-label' ) } ); - this.applyButton = new OO.ui.PushButtonWidget( { + this.applyButton = new OO.ui.ButtonWidget( { '$': this.$, 'label': ve.msg( 'visualeditor-dialog-action-apply' ), 'flags': ['primary'] diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js index fea966e..d99c188 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js @@ -351,7 +351,7 @@ /* Buttons */ // Save button for "save" panel - this.saveButton = new OO.ui.PushButtonWidget( { + this.saveButton = new OO.ui.ButtonWidget( { 'label': ve.msg( // visualeditor-savedialog-label-restore, visualeditor-savedialog-label-save 'visualeditor-savedialog-label-' + ( this.restoring ? 'restore' : 'save' ) @@ -361,19 +361,19 @@ this.saveButton.connect( this, { 'click': [ 'emit', 'save' ] } ); // Review button for "save" panel - this.reviewButton = new OO.ui.PushButtonWidget( { + this.reviewButton = new OO.ui.ButtonWidget( { 'label': ve.msg( 'visualeditor-savedialog-label-review' ) } ); this.reviewButton.connect( this, { 'click': [ 'emit', 'review' ] } ); // Review good button on "review" panel - this.reviewGoodButton = new OO.ui.PushButtonWidget( { + this.reviewGoodButton = new OO.ui.ButtonWidget( { 'label': ve.msg( 'visualeditor-savedialog-label-review-good' ), 'flags': ['constructive'] } ); this.reviewGoodButton.connect( this, { 'click': [ 'swapPanel', 'save' ] } ); // Resolve conflict - this.resolveConflictButton = new OO.ui.PushButtonWidget( { + this.resolveConflictButton = new OO.ui.ButtonWidget( { 'label': ve.msg( 'visualeditor-savedialog-label-resolve-conflict' ), 'flags': ['constructive'] } ); diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js index d394e6a..a4ba58a 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js @@ -157,7 +157,7 @@ ve.ui.MWDialog.prototype.initialize.call( this ); // Properties - this.applyButton = new OO.ui.PushButtonWidget( { + this.applyButton = new OO.ui.ButtonWidget( { '$': this.$, 'label': ve.msg( 'visualeditor-dialog-action-apply' ), 'flags': ['primary'] diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js index b14cdb6..f998513 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js @@ -29,8 +29,9 @@ this.label = this.spec.getLabel(); this.addParameterSearch = new ve.ui.MWParameterSearchWidget( this.template, { '$': this.$ } ) .connect( this, { 'select': 'onParameterSelect' } ); - this.removeButton = new OO.ui.IconButtonWidget( { + this.removeButton = new OO.ui.ButtonWidget( { '$': this.$, + 'frameless': true, 'icon': 'remove', 'title': ve.msg( 'visualeditor-dialog-transclusion-remove-template' ), 'flags': ['destructive'], diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js b/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js index 09b793e..b23c9b8 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js @@ -46,8 +46,9 @@ 'input': this.textInput, 'label': this.spec.getParameterDescription( this.parameter.getName() ) || '' } ); - this.removeButton = new OO.ui.IconButtonWidget( { + this.removeButton = new OO.ui.ButtonWidget( { '$': this.$, + 'frameless': true, 'icon': 'remove', 'title': ve.msg( 'visualeditor-dialog-transclusion-remove-param' ), 'flags': ['destructive'], diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js index f5256fe..a59270b 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js @@ -35,15 +35,16 @@ 'change': 'onTemplateInputChange', 'enter': 'onAddTemplate' } ); - this.addTemplateButton = new OO.ui.PushButtonWidget( { + this.addTemplateButton = new OO.ui.ButtonWidget( { '$': this.$, 'label': ve.msg( 'visualeditor-dialog-transclusion-add-template' ), 'flags': ['constructive'], 'disabled': true } ) .connect( this, { 'click': 'onAddTemplate' } ); - this.removeButton = new OO.ui.IconButtonWidget( { + this.removeButton = new OO.ui.ButtonWidget( { '$': this.$, + 'frameless': true, 'icon': 'remove', 'title': ve.msg( 'visualeditor-dialog-transclusion-remove-template' ), 'flags': ['destructive'], diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js b/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js index b58b119..7dd843e 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js @@ -33,8 +33,9 @@ } ) .setValue( this.content.getValue() ) .connect( this, { 'change': 'onTextInputChange' } ); - this.removeButton = new OO.ui.IconButtonWidget( { + this.removeButton = new OO.ui.ButtonWidget( { '$': this.$, + 'frameless': true, 'icon': 'remove', 'title': ve.msg( 'visualeditor-dialog-transclusion-remove-content' ), 'flags': [ 'destructive' ], diff --git a/modules/ve-mw/ui/styles/ve.ui.MWDialog.css b/modules/ve-mw/ui/styles/ve.ui.MWDialog.css index dc8a1c9..5e04b8a 100644 --- a/modules/ve-mw/ui/styles/ve.ui.MWDialog.css +++ b/modules/ve-mw/ui/styles/ve.ui.MWDialog.css @@ -19,7 +19,7 @@ display: inline-block; } -.ve-ui-mwTransclusionDialog-addTemplateFieldset .oo-ui-pushButtonWidget { +.ve-ui-mwTransclusionDialog-addTemplateFieldset .oo-ui-buttonedElement-framed { margin-left: 0.5em; } diff --git a/modules/ve-mw/ui/styles/ve.ui.MWWidget.css b/modules/ve-mw/ui/styles/ve.ui.MWWidget.css index d3018dd..3e361f9 100644 --- a/modules/ve-mw/ui/styles/ve.ui.MWWidget.css +++ b/modules/ve-mw/ui/styles/ve.ui.MWWidget.css @@ -145,7 +145,7 @@ padding: 0.75em 0.5em; } -.ve-ui-mwCategoryPopupWidget .oo-ui-iconButtonWidget { +.ve-ui-mwCategoryPopupWidget .oo-ui-buttonedElement-frameless { display: block; float: left; } diff --git a/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js b/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js index 0f906b1..a653306 100644 --- a/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js +++ b/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js @@ -104,14 +104,18 @@ // Properties this.$items = this.$( '<div>' ); this.feedback = null; - this.helpButton = new OO.ui.IconButtonWidget( { + this.helpButton = new OO.ui.ButtonWidget( { + '$': this.$, + 'frameless': true, 'icon': 'help', 'title': ve.msg( 'visualeditor-help-title' ), 'href': new mw.Title( ve.msg( 'visualeditor-help-link' ) ).getUrl(), 'target': '_blank', 'label': ve.msg( 'visualeditor-help-label' ) } ); - this.feedbackButton = new OO.ui.IconButtonWidget( { + this.feedbackButton = new OO.ui.ButtonWidget( { + '$': this.$, + 'frameless': true, 'icon': 'comment', 'label': ve.msg( 'visualeditor-feedback-tool' ) } ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js index 125fd2e..2a92ed7 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js @@ -27,8 +27,11 @@ this.removed = false; this.$title = this.$( '<label>' ); this.$menu = this.$( '<div>' ); - this.removeButton = new OO.ui.IconButtonWidget( { - '$': this.$, 'icon': 'remove', 'title': ve.msg( 'visualeditor-inspector-remove-tooltip' ) + this.removeButton = new OO.ui.ButtonWidget( { + '$': this.$, + 'frameless': true, + 'icon': 'remove', + 'title': ve.msg( 'visualeditor-inspector-remove-tooltip' ) } ); this.sortKeyInput = new OO.ui.TextInputWidget( { '$': this.$ } ); this.sortKeyLabel = new OO.ui.InputLabelWidget( -- To view, visit https://gerrit.wikimedia.org/r/108044 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82220d15221c52be03feafcfc85c2bd6c12ba462 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders <esand...@wikimedia.org> Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits