From e9a898c869062a0c880560c66917578fe371451c Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Fri, 29 Apr 2016 17:10:02 -0700 Subject: [PATCH] fix(undo): Don't create separate commands, since they bubble separately --- internal_packages/composer/keymaps/composer.json | 2 -- internal_packages/composer/lib/composer-view.jsx | 4 ++-- keymaps/base.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/internal_packages/composer/keymaps/composer.json b/internal_packages/composer/keymaps/composer.json index 807fc3364..3a3120ac5 100644 --- a/internal_packages/composer/keymaps/composer.json +++ b/internal_packages/composer/keymaps/composer.json @@ -4,8 +4,6 @@ "composer:show-and-focus-bcc": "mod+shift+b", "composer:show-and-focus-from": "mod+shift+f", "composer:send-message": "mod+enter", - "composer:undo": "mod+z", - "composer:redo": "mod+y", "composer:no-op": "delete", "composer:delete-empty-draft": "escape" } diff --git a/internal_packages/composer/lib/composer-view.jsx b/internal_packages/composer/lib/composer-view.jsx index 97db1cae7..30591d6fe 100644 --- a/internal_packages/composer/lib/composer-view.jsx +++ b/internal_packages/composer/lib/composer-view.jsx @@ -108,8 +108,8 @@ export default class ComposerView extends React.Component { 'composer:show-and-focus-cc': () => this.refs.header.showAndFocusField(Fields.Cc), 'composer:focus-to': () => this.refs.header.showAndFocusField(Fields.To), "composer:show-and-focus-from": () => {}, // todo - "composer:undo": this.undo, - "composer:redo": this.redo, + "core:undo": this.undo, + "core:redo": this.redo, }; } diff --git a/keymaps/base.json b/keymaps/base.json index 4708a739d..983613087 100644 --- a/keymaps/base.json +++ b/keymaps/base.json @@ -1,6 +1,6 @@ { "core:undo": "mod+z", - "core:redo": "mod+y", + "core:redo": ["mod+shift+z", "mod+y"], "core:cut": "mod+x", "core:copy": "mod+c", "core:paste": "mod+v",