jenkins-bot has submitted this change and it was merged.
Change subject: Mark primary buttons as progressive as well
......................................................................
Mark primary buttons as progressive as well
Also make save button primary.
In anticipation of Iee91d2c6 in OOjs UI
Change-Id: I123044bfaba631866ad32a35643f23686a17a16f
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.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.MWReferencesListDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
9 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
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 68054f9..d4cbecd 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1083,7 +1083,7 @@
ve.init.mw.ViewPageTarget.prototype.setupToolbarSaveButton = function () {
this.toolbarSaveButton = new OO.ui.ButtonWidget( {
label: ve.msg( 'visualeditor-toolbar-savedialog' ),
- flags: ['constructive'],
+ flags: [ 'constructive', 'primary' ],
disabled: !this.restoring
} );
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js
index f3eabcc..7a888fe 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js
@@ -36,7 +36,7 @@
ve.ui.MWBetaWelcomeDialog.static.actions = [
{
label: OO.ui.deferMsg(
'visualeditor-dialog-beta-welcome-action-continue' ),
- flags: 'primary'
+ flags: [ 'progressive', 'primary' ]
}
];
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index c125894..99dd28f 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -48,7 +48,7 @@
{
action: 'apply',
label: OO.ui.deferMsg( 'visualeditor-dialog-action-apply' ),
- flags: 'primary',
+ flags: [ 'progressive', 'primary' ],
modes: 'edit'
},
{
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index caf58c2..56cbbcb 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -38,7 +38,7 @@
{
action: 'apply',
label: OO.ui.deferMsg( 'visualeditor-dialog-action-apply' ),
- flags: 'primary'
+ flags: [ 'progressive', 'primary' ]
},
{
label: OO.ui.deferMsg( 'visualeditor-dialog-action-cancel' ),
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 678b9b9..c6d85d7 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -39,7 +39,7 @@
{
action: 'apply',
label: OO.ui.deferMsg( 'visualeditor-dialog-action-apply' ),
- flags: 'primary',
+ flags: [ 'progressive', 'primary' ],
modes: 'edit'
},
{
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js
index d98c59a..3307515 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js
@@ -40,7 +40,7 @@
{
action: 'apply',
label: OO.ui.deferMsg( 'visualeditor-dialog-action-apply' ),
- flags: 'primary',
+ flags: [ 'progressive', 'primary' ],
modes: 'edit'
},
{
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 09f03d5..0a32cf2 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -60,7 +60,7 @@
{
action: 'approve',
label: OO.ui.deferMsg(
'visualeditor-savedialog-label-review-good' ),
- flags: 'primary',
+ flags: [ 'progressive', 'primary' ],
modes: 'review'
},
{
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
index 385bfd1..7dec781 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
@@ -46,7 +46,7 @@
{
action: 'apply',
label: OO.ui.deferMsg( 'visualeditor-dialog-action-apply' ),
- flags: 'primary',
+ flags: [ 'progressive', 'primary' ],
modes: 'edit'
},
{
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
index 7606ae0..8cd02c1 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
@@ -48,7 +48,7 @@
{
action: 'switch',
label: OO.ui.deferMsg(
'visualeditor-mweditmodesource-warning-switch' ),
- flags: 'primary'
+ flags: [ 'progressive', 'primary' ]
},
{
action: 'discard',
--
To view, visit https://gerrit.wikimedia.org/r/179269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I123044bfaba631866ad32a35643f23686a17a16f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
