wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 22:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Replace constructive with progressive UI flag"

Browse source
This commit is contained in:
jenkins-bot 2017-09-26 22:04:46 +00:00 committed by Gerrit Code Review
parent db5a06afd7 2c70792c4f
commit 2411e7c04e
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
View file

@ -105,7 +105,7 @@ class VisualEditorPage
div(:media_select, class: 'mw-widget-mediaResultWidget-overlay')
div(:medium_dialog, class: 'oo-ui-window oo-ui-dialog oo-ui-dialog-open oo-ui-dialog-medium')
span(:use_image_button, css: '.oo-ui-processDialog-actions-primary > div:nth-child(1) > a:nth-child(1) > span:nth-child(2)')
span(:media_insert_button, css: '.oo-ui-flaggedElement-constructive > a:nth-child(1) > span:nth-child(2)')
span(:media_insert_button, css: '.oo-ui-flaggedElement-progressive > a:nth-child(1) > span:nth-child(2)')
div(:caption, css: 'div.ve-ui-surface:nth-child(2) > div:nth-child(1) > div.ve-ce-documentNode.ve-ce-branchNode')
text_field(:alternative_text, css: '.oo-ui-textInputWidget.ve-ui-mwMediaDialog-altText > input')
checkbox(:minor_edit, id: 'wpMinoredit')

2
modules/ve-mw/ui/dialogs/ve.ui.MWExtensionDialog.js
View file

@ -47,7 +47,7 @@ ve.ui.MWExtensionDialog.static.actions = ve.ui.MWExtensionDialog.super.static.ac
{
action: 'done',
label: OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ),
flags: [ 'constructive', 'primary' ],
flags: [ 'progressive', 'primary' ],
modes: 'insert'
}
] );

2
modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
View file

@ -52,7 +52,7 @@ ve.ui.MWMediaDialog.static.actions = [
{
action: 'insert',
label: OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ),
flags: [ 'primary', 'constructive' ],
flags: [ 'primary', 'progressive' ],
modes: 'insert'
},
{

4
modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
View file

@ -57,7 +57,7 @@ ve.ui.MWSaveDialog.static.actions = [
action: 'save',
// May be overridden by config.saveButtonLabel
label: OO.ui.deferMsg( 'visualeditor-savedialog-label-review' ),
flags: [ 'primary', 'constructive' ],
flags: [ 'primary', 'progressive' ],
modes: [ 'save', 'review', 'preview' ],
accessKey: 's'
},
@ -84,7 +84,7 @@ ve.ui.MWSaveDialog.static.actions = [
{
action: 'resolve',
label: OO.ui.deferMsg( 'visualeditor-savedialog-label-resolve-conflict' ),
flags: [ 'primary', 'constructive' ],
flags: [ 'primary', 'progressive' ],
modes: 'conflict'
},
{

2
modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
View file

@ -50,7 +50,7 @@ ve.ui.MWTemplateDialog.static.actions = [
{
action: 'insert',
label: OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ),
flags: [ 'primary', 'constructive' ],
flags: [ 'primary', 'progressive' ],
modes: 'insert'
},
{

2
modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
View file

@ -41,7 +41,7 @@ ve.ui.MWTemplatePlaceholderPage = function VeUiMWTemplatePlaceholderPage( placeh
this.addTemplateButton = new OO.ui.ButtonWidget( {
label: ve.msg( 'visualeditor-dialog-transclusion-add-template' ),
flags: [ 'constructive' ],
flags: [ 'progressive' ],
classes: [ 've-ui-mwTransclusionDialog-addButton' ],
disabled: true
} )