[MediaWiki-commits] [Gerrit] Add cmd+[ / cmd+] as extra bindings for indent/outdent trigger - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add cmd+[ / cmd+] as extra bindings for indent/outdent trigger
..


Add cmd+[ / cmd+] as extra bindings for indent/outdent trigger

Change-Id: Iacb5bb7fd2fd5ba65f47ce3e78d053481938afcd
---
M src/ce/ve.ce.Surface.js
M src/ui/ve.ui.TriggerRegistry.js
2 files changed, 21 insertions(+), 3 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index d8b4f30..3314713 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1082,7 +1082,7 @@
 ve.ce.Surface.prototype.isBlockedTrigger = function ( trigger ) {
var platformKey = ve.getSystemPlatform() === 'mac' ? 'mac' : 'pc',
blocked = {
-   mac: [ 'meta+b', 'meta+i', 'meta+u', 'meta+z', 
'meta+y', 'meta+shift+z', 'tab', 'shift+tab' ],
+   mac: [ 'meta+b', 'meta+i', 'meta+u', 'meta+z', 
'meta+y', 'meta+shift+z', 'tab', 'shift+tab', 'meta+[', 'meta+]' ],
pc: [ 'ctrl+b', 'ctrl+i', 'ctrl+u', 'ctrl+z', 'ctrl+y', 
'ctrl+shift+z', 'tab', 'shift+tab' ]
};
 
diff --git a/src/ui/ve.ui.TriggerRegistry.js b/src/ui/ve.ui.TriggerRegistry.js
index 4602c88..db4d529 100644
--- a/src/ui/ve.ui.TriggerRegistry.js
+++ b/src/ui/ve.ui.TriggerRegistry.js
@@ -131,10 +131,28 @@
'superscript', { mac: new ve.ui.Trigger( 'cmd+.' ), pc: new 
ve.ui.Trigger( 'ctrl+.' ) }
 );
 ve.ui.triggerRegistry.register(
-   'indent', new ve.ui.Trigger( 'tab' )
+   'indent', {
+   mac: [
+   new ve.ui.Trigger( 'tab' ),
+   new ve.ui.Trigger( 'cmd+]' )
+   ],
+   pc: [
+   new ve.ui.Trigger( 'tab' ),
+   new ve.ui.Trigger( 'ctrl+]' )
+   ]
+   }
 );
 ve.ui.triggerRegistry.register(
-   'outdent', new ve.ui.Trigger( 'shift+tab' )
+   'outdent', {
+   mac: [
+   new ve.ui.Trigger( 'shift+tab' ),
+   new ve.ui.Trigger( 'cmd+[' )
+   ],
+   pc: [
+   new ve.ui.Trigger( 'shift+tab' ),
+   new ve.ui.Trigger( 'ctrl+[' )
+   ]
+   }
 );
 ve.ui.triggerRegistry.register(
'commandHelp', {

-- 
To view, visit https://gerrit.wikimedia.org/r/255482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacb5bb7fd2fd5ba65f47ce3e78d053481938afcd
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add cmd+[ / cmd+] as extra bindings for indent/outdent trigger - change (VisualEditor/VisualEditor)

[DLynch (Code Review)]

DLynch has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/255482

Change subject: Add cmd+[ / cmd+] as extra bindings for indent/outdent trigger
..

Add cmd+[ / cmd+] as extra bindings for indent/outdent trigger

Change-Id: Iacb5bb7fd2fd5ba65f47ce3e78d053481938afcd
---
M src/ce/ve.ce.Surface.js
M src/ui/ve.ui.TriggerRegistry.js
2 files changed, 21 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/82/255482/1

diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index d8b4f30..3314713 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1082,7 +1082,7 @@
 ve.ce.Surface.prototype.isBlockedTrigger = function ( trigger ) {
var platformKey = ve.getSystemPlatform() === 'mac' ? 'mac' : 'pc',
blocked = {
-   mac: [ 'meta+b', 'meta+i', 'meta+u', 'meta+z', 
'meta+y', 'meta+shift+z', 'tab', 'shift+tab' ],
+   mac: [ 'meta+b', 'meta+i', 'meta+u', 'meta+z', 
'meta+y', 'meta+shift+z', 'tab', 'shift+tab', 'meta+[', 'meta+]' ],
pc: [ 'ctrl+b', 'ctrl+i', 'ctrl+u', 'ctrl+z', 'ctrl+y', 
'ctrl+shift+z', 'tab', 'shift+tab' ]
};
 
diff --git a/src/ui/ve.ui.TriggerRegistry.js b/src/ui/ve.ui.TriggerRegistry.js
index 4602c88..db4d529 100644
--- a/src/ui/ve.ui.TriggerRegistry.js
+++ b/src/ui/ve.ui.TriggerRegistry.js
@@ -131,10 +131,28 @@
'superscript', { mac: new ve.ui.Trigger( 'cmd+.' ), pc: new 
ve.ui.Trigger( 'ctrl+.' ) }
 );
 ve.ui.triggerRegistry.register(
-   'indent', new ve.ui.Trigger( 'tab' )
+   'indent', {
+   mac: [
+   new ve.ui.Trigger( 'tab' ),
+   new ve.ui.Trigger( 'cmd+]' )
+   ],
+   pc: [
+   new ve.ui.Trigger( 'tab' ),
+   new ve.ui.Trigger( 'ctrl+]' )
+   ]
+   }
 );
 ve.ui.triggerRegistry.register(
-   'outdent', new ve.ui.Trigger( 'shift+tab' )
+   'outdent', {
+   mac: [
+   new ve.ui.Trigger( 'shift+tab' ),
+   new ve.ui.Trigger( 'cmd+[' )
+   ],
+   pc: [
+   new ve.ui.Trigger( 'shift+tab' ),
+   new ve.ui.Trigger( 'ctrl+[' )
+   ]
+   }
 );
 ve.ui.triggerRegistry.register(
'commandHelp', {

-- 
To view, visit https://gerrit.wikimedia.org/r/255482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacb5bb7fd2fd5ba65f47ce3e78d053481938afcd
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits