wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-24 18:58:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Register shortcuts for minoredit/watchlist"

Browse source
This commit is contained in:
jenkins-bot 2017-01-03 18:54:26 +00:00 committed by Gerrit Code Review
parent 945d3d4cbc 7611ee5a2c
commit 78a38ae6ea
3 changed files with 73 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extension.json
View file

@ -519,6 +519,10 @@
"accesskey-diff",
"accesskey-preview",
"accesskey-save",
"accesskey-minoredit",
"accesskey-watch",
"tooltip-minoredit",
"tooltip-watch",
"newsectionsummary"
],
"targets": [

16
modules/ve-mw/init/ve.init.mw.ArticleTarget.js
View file

@ -1851,11 +1851,13 @@ ve.init.mw.ArticleTarget.prototype.onToolbarSaveButtonClick = function () {
* Show a save dialog
*
* @param {string} [action] Window action to trigger after opening
* @param {string} [checkboxName] Checkbox to toggle after opening
*
* @fires saveWorkflowBegin
*/
ve.init.mw.ArticleTarget.prototype.showSaveDialog = function ( action ) {
var target = this;
ve.init.mw.ArticleTarget.prototype.showSaveDialog = function ( action, checkboxName ) {
var checkbox,
target = this;
if ( !( this.edited || this.restoring ) ) {
return;
@ -1868,7 +1870,7 @@ ve.init.mw.ArticleTarget.prototype.showSaveDialog = function ( action ) {
// Get the save dialog
this.getSurface().getDialogs().getWindow( 'mwSave' ).done( function ( win ) {
var data,
var data, checked,
windowAction = ve.ui.actionFactory.create( 'window', target.getSurface() );
if ( !target.saveDialog ) {
@ -1894,6 +1896,14 @@ ve.init.mw.ArticleTarget.prototype.showSaveDialog = function ( action ) {
return;
}
if ( checkboxName && ( checkbox = target.checkboxesByName[ checkboxName ] ) ) {
checked = !checkbox.isSelected();
// Wait for native access key change to happen
setTimeout( function () {
checkbox.setSelected( checked );
} );
}
// When calling review/preview action, switch to those panels immediately
if ( action === 'review' || action === 'preview' ) {
data.initialPanel = action;

92
modules/ve-mw/ui/actions/ve.ui.MWSaveDialogAction.js
View file

@ -43,10 +43,11 @@ ve.ui.MWSaveDialogAction.static.methods = [ 'save', 'review', 'preview' ];
* Open the save dialog
*
* @method
* @param {string} checkbox Checkbox to toggle after opening
* @return {boolean} Action was executed
*/
ve.ui.MWSaveDialogAction.prototype.save = function () {
ve.init.target.showSaveDialog();
ve.ui.MWSaveDialogAction.prototype.save = function ( checkbox ) {
ve.init.target.showSaveDialog( null, checkbox );
return true;
};
@ -100,42 +101,61 @@ if ( mw.libs.ve.isWikitextAvailable ) {
);
} );
}
ve.ui.commandRegistry.register(
new ve.ui.Command(
'saveMinoredit', 'mwSaveDialog', 'save',
{ args: [ 'wpMinoredit' ], supportedSelections: [ 'linear', 'table' ] }
)
);
ve.ui.commandRegistry.register(
new ve.ui.Command(
'saveWatchthis', 'mwSaveDialog', 'save',
{ args: [ 'wpWatchthis' ], supportedSelections: [ 'linear', 'table' ] }
)
);
( function () {
var accessKeyPrefix = $.fn.updateTooltipAccessKeys.getAccessKeyPrefix().replace( /-/g, '+' ),
saveShortcut = ve.msg( 'accesskey-save' ),
changesShortcut = ve.msg( 'accesskey-diff' ),
previewShortcut = ve.msg( 'accesskey-preview' );
shortcuts = [
{
command: 'showSave',
accessKey: 'accesskey-save',
label: function () { return ve.init.target.getSaveButtonLabel(); }
},
{
command: 'showChanges',
accessKey: 'accesskey-diff',
label: OO.ui.deferMsg( 'visualeditor-savedialog-label-review' )
},
{
command: 'showPreview',
accessKey: 'accesskey-preview',
label: OO.ui.deferMsg( 'showpreview' )
},
{
command: 'saveMinoredit',
accessKey: 'accesskey-minoredit',
label: OO.ui.deferMsg( 'tooltip-minoredit' )
},
{
command: 'saveWatchthis',
accessKey: 'accesskey-watch',
label: OO.ui.deferMsg( 'tooltip-watch' )
}
];
if ( saveShortcut !== '-' && saveShortcut !== '' ) {
ve.ui.triggerRegistry.register(
'showSave', new ve.ui.Trigger( accessKeyPrefix + saveShortcut )
);
ve.ui.commandHelpRegistry.register( 'other', 'showSave', {
trigger: 'showSave',
label: function () { return ve.init.target.getSaveButtonLabel(); }
} );
ve.ui.MWCommandHelpDialog.static.commandGroups.other.demote.push( 'showSave' );
}
shortcuts.forEach( function ( shortcut ) {
var accessKey = ve.msg( shortcut.accessKey );
if ( accessKey !== '-' && accessKey !== '' ) {
ve.ui.triggerRegistry.register(
shortcut.command, new ve.ui.Trigger( accessKeyPrefix + accessKey )
);
ve.ui.commandHelpRegistry.register( 'other', shortcut.command, {
trigger: shortcut.command,
label: shortcut.label
} );
ve.ui.MWCommandHelpDialog.static.commandGroups.other.demote.push( shortcut.command );
}
} );
if ( changesShortcut !== '-' && changesShortcut !== '' ) {
ve.ui.triggerRegistry.register(
'showChanges', new ve.ui.Trigger( accessKeyPrefix + changesShortcut )
);
ve.ui.commandHelpRegistry.register( 'other', 'showChanges', {
trigger: 'showChanges',
label: OO.ui.deferMsg( 'visualeditor-savedialog-label-review' )
} );
ve.ui.MWCommandHelpDialog.static.commandGroups.other.demote.push( 'showChanges' );
}
if ( previewShortcut !== '-' && previewShortcut !== '' ) {
ve.ui.triggerRegistry.register(
'showPreview', new ve.ui.Trigger( accessKeyPrefix + previewShortcut )
);
ve.ui.commandHelpRegistry.register( 'other', 'showPreview', {
trigger: 'showPreview',
label: OO.ui.deferMsg( 'showpreview' )
} );
ve.ui.MWCommandHelpDialog.static.commandGroups.other.demote.push( 'showPreview' );
}
}() );