jenkins-bot has submitted this change and it was merged. Change subject: MWCommandHelpDialog: update for core changes ......................................................................
MWCommandHelpDialog: update for core changes Also: update VE core submodule to master (61f3fe7) New changes: 4ef3666 Localisation updates from https://translatewiki.net. cfa3482 Localisation updates from https://translatewiki.net. d3486d4 CommandHelpDialog: Rename 'category' to 'groupName' b5578d1 Localisation updates from https://translatewiki.net. 926595e Update OOjs UI to v0.13.1 61f3fe7 [BREAKING CHANGE] Create CommandHelpRegistry for CommandHelpDialog Change-Id: If651ed30ab85175c7a262d9ccccc2e1613b0f3d6 --- M .jsduck/eg-iframe.html M extension.json M lib/ve M modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js 4 files changed, 11 insertions(+), 10 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 48c83ab..a3732d7 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -345,6 +345,7 @@ <script src="lib/ve/src/ui/ve.ui.ToolFactory.js"></script> <script src="lib/ve/src/ui/ve.ui.Command.js"></script> <script src="lib/ve/src/ui/ve.ui.CommandRegistry.js"></script> + <script src="lib/ve/src/ui/ve.ui.CommandHelpRegistry.js"></script> <script src="lib/ve/src/ui/ve.ui.Trigger.js"></script> <script src="lib/ve/src/ui/ve.ui.TriggerRegistry.js"></script> <script src="lib/ve/src/ui/ve.ui.Sequence.js"></script> diff --git a/extension.json b/extension.json index 57f93c6..7b0496b 100644 --- a/extension.json +++ b/extension.json @@ -674,6 +674,7 @@ "lib/ve/src/ui/ve.ui.ToolFactory.js", "lib/ve/src/ui/ve.ui.Command.js", "lib/ve/src/ui/ve.ui.CommandRegistry.js", + "lib/ve/src/ui/ve.ui.CommandHelpRegistry.js", "lib/ve/src/ui/ve.ui.Trigger.js", "lib/ve/src/ui/ve.ui.TriggerRegistry.js", "lib/ve/src/ui/ve.ui.Sequence.js", diff --git a/lib/ve b/lib/ve index 062cb26..61f3fe7 160000 --- a/lib/ve +++ b/lib/ve -Subproject commit 062cb2689a681861fd425bff6111c06bfed7141c +Subproject commit 61f3fe7603d7a262d2b6a161887eb399f87f9335 diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js index 814aab3..3618915 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js @@ -28,7 +28,6 @@ ve.ui.MWCommandHelpDialog.static.commandGroups = ve.extendObject( ve.ui.CommandHelpDialog.static.commandGroups, { insert: { title: 'visualeditor-shortcuts-insert', - commands: {}, promote: [], demote: [] } @@ -42,32 +41,32 @@ var accessKeyPrefix = $.fn.updateTooltipAccessKeys.getAccessKeyPrefix().toUpperCase().replace( /-/g, ' + ' ), save = ve.msg( 'accesskey-save' ); - ve.ui.MWCommandHelpDialog.static.registerCommand( 'textStyle', 'link', { sequence: [ 'wikitextLink' ] } ); - ve.ui.MWCommandHelpDialog.static.registerCommand( 'formatting', 'blockquote', { sequence: [ 'wikitextDescription' ] } ); - ve.ui.MWCommandHelpDialog.static.registerCommand( 'formatting', 'listNumber', { sequence: [ 'numberHash' ] } ); - ve.ui.MWCommandHelpDialog.static.registerCommand( 'formatting', 'heading2', { + ve.ui.commandHelpRegistry.register( 'textStyle', 'link', { sequence: [ 'wikitextLink' ] } ); + ve.ui.commandHelpRegistry.register( 'formatting', 'blockquote', { sequence: [ 'wikitextDescription' ] } ); + ve.ui.commandHelpRegistry.register( 'formatting', 'listNumber', { sequence: [ 'numberHash' ] } ); + ve.ui.commandHelpRegistry.register( 'formatting', 'heading2', { sequence: [ 'wikitextHeading' ], msg: 'visualeditor-formatdropdown-format-heading2' } ); - ve.ui.MWCommandHelpDialog.static.registerCommand( 'insert', 'template', { + ve.ui.commandHelpRegistry.register( 'insert', 'template', { sequence: [ 'wikitextTemplate' ], msg: 'visualeditor-dialog-template-title' } ); - ve.ui.MWCommandHelpDialog.static.registerCommand( 'insert', 'ref', { + ve.ui.commandHelpRegistry.register( 'insert', 'ref', { sequence: [ 'wikitextRef' ], msg: 'visualeditor-dialog-reference-title' } ); - ve.ui.MWCommandHelpDialog.static.registerCommand( 'insert', 'table', { + ve.ui.commandHelpRegistry.register( 'insert', 'table', { sequence: [ 'wikitextTable' ], msg: 'visualeditor-table-insert-table' } ); - ve.ui.MWCommandHelpDialog.static.registerCommand( 'insert', 'comment', { + ve.ui.commandHelpRegistry.register( 'insert', 'comment', { sequence: [ 'wikitextComment' ], msg: 'visualeditor-commentinspector-title' } ); if ( save !== '-' && save !== '' ) { - ve.ui.MWCommandHelpDialog.static.registerCommand( 'other', 'save', { + ve.ui.commandHelpRegistry.register( 'other', 'save', { shortcuts: [ accessKeyPrefix + save.toUpperCase() ], msg: 'visualeditor-savedialog-label-save', demote: true -- To view, visit https://gerrit.wikimedia.org/r/251006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If651ed30ab85175c7a262d9ccccc2e1613b0f3d6 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: DLynch <[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
