Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131596
Change subject: Fix command help for CTRL+1-6 on mac
......................................................................
Fix command help for CTRL+1-6 on mac
Also simplify definitions where mac & pc are the same.
Bug: 64771
Change-Id: Ib18503bf1bcf64be3e7833ade0005f54c80e0de7
---
M modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
M modules/ve/ui/ve.ui.TriggerRegistry.js
2 files changed, 9 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/96/131596/1
diff --git a/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
b/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
index 3ebaa27..9be3ad0 100644
--- a/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
+++ b/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
@@ -125,13 +125,7 @@
'title': 'visualeditor-shortcuts-formatting',
'commands': [
{ 'trigger': 'paragraph', 'msg':
'visualeditor-formatdropdown-format-paragraph' },
- {
- 'shortcuts': [ {
- 'mac': 'cmd+(1-6)',
- 'pc': 'ctrl+(1-6)'
- } ],
- 'msg':
'visualeditor-formatdropdown-format-heading-label'
- },
+ { 'shortcuts': ['ctrl+(1-6)'], 'msg':
'visualeditor-formatdropdown-format-heading-label' },
{ 'trigger': 'preformatted', 'msg':
'visualeditor-formatdropdown-format-preformatted' },
{ 'trigger': 'indent', 'msg':
'visualeditor-indentationbutton-indent-tooltip' },
{ 'trigger': 'outdent', 'msg':
'visualeditor-indentationbutton-outdent-tooltip' }
diff --git a/modules/ve/ui/ve.ui.TriggerRegistry.js
b/modules/ve/ui/ve.ui.TriggerRegistry.js
index 10d3ba9..f542602 100644
--- a/modules/ve/ui/ve.ui.TriggerRegistry.js
+++ b/modules/ve/ui/ve.ui.TriggerRegistry.js
@@ -131,28 +131,28 @@
);
// Ctrl+0-7 below are not mapped to Cmd+0-7 on Mac because Chrome reserves
those for switching tabs
ve.ui.triggerRegistry.register(
- 'paragraph', { 'mac': new ve.ui.Trigger( 'ctrl+0' ), 'pc': new
ve.ui.Trigger ( 'ctrl+0' ) }
+ 'paragraph', new ve.ui.Trigger( 'ctrl+0' )
);
ve.ui.triggerRegistry.register(
- 'heading1', { 'mac': new ve.ui.Trigger( 'ctrl+1' ), 'pc': new
ve.ui.Trigger ( 'ctrl+1' ) }
+ 'heading1', new ve.ui.Trigger ( 'ctrl+1' )
);
ve.ui.triggerRegistry.register(
- 'heading2', { 'mac': new ve.ui.Trigger( 'ctrl+2' ), 'pc': new
ve.ui.Trigger ( 'ctrl+2' ) }
+ 'heading2', new ve.ui.Trigger ( 'ctrl+2' )
);
ve.ui.triggerRegistry.register(
- 'heading3', { 'mac': new ve.ui.Trigger( 'ctrl+3' ), 'pc': new
ve.ui.Trigger ( 'ctrl+3' ) }
+ 'heading3', new ve.ui.Trigger ( 'ctrl+3' )
);
ve.ui.triggerRegistry.register(
- 'heading4', { 'mac': new ve.ui.Trigger( 'ctrl+4' ), 'pc': new
ve.ui.Trigger ( 'ctrl+4' ) }
+ 'heading4', new ve.ui.Trigger ( 'ctrl+4' )
);
ve.ui.triggerRegistry.register(
- 'heading5', { 'mac': new ve.ui.Trigger( 'ctrl+5' ), 'pc': new
ve.ui.Trigger ( 'ctrl+5' ) }
+ 'heading5', new ve.ui.Trigger ( 'ctrl+5' )
);
ve.ui.triggerRegistry.register(
- 'heading6', { 'mac': new ve.ui.Trigger( 'ctrl+6' ), 'pc': new
ve.ui.Trigger ( 'ctrl+6' ) }
+ 'heading6', new ve.ui.Trigger ( 'ctrl+6' )
);
ve.ui.triggerRegistry.register(
- 'preformatted', { 'mac': new ve.ui.Trigger( 'ctrl+7' ), 'pc': new
ve.ui.Trigger ( 'ctrl+7' ) }
+ 'preformatted', new ve.ui.Trigger ( 'ctrl+7' )
);
ve.ui.triggerRegistry.register(
'pasteSpecial', { 'mac': new ve.ui.Trigger( 'cmd+shift+v' ), 'pc': new
ve.ui.Trigger ( 'ctrl+shift+v' ) }
--
To view, visit https://gerrit.wikimedia.org/r/131596
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib18503bf1bcf64be3e7833ade0005f54c80e0de7
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
