From c3538cd89cb2c1d3ad5487d13643db77db875067 Mon Sep 17 00:00:00 2001 From: Johannes Millan Date: Sat, 10 Mar 2018 01:17:33 +0100 Subject: [PATCH] feat: add button to reset all keyboard shortcuts --- .../settings/keyboard-settings/keyboard-settings-d.html | 6 ++++++ .../settings/keyboard-settings/keyboard-settings-d.js | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.html b/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.html index 7c59100e35..7d9af87bcf 100644 --- a/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.html +++ b/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.html @@ -190,3 +190,9 @@ ng-model="vm.keys.taskOpenOriginalLink"> + + + + Reset all shortcuts + diff --git a/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.js b/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.js index 82154b87cd..6ac4258b3f 100644 --- a/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.js +++ b/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.js @@ -5,7 +5,7 @@ * # keyboardSettings */ -(function () { +(function() { 'use strict'; angular @@ -27,7 +27,7 @@ } /* @ngInject */ - function KeyboardSettingsCtrl(IS_ELECTRON) { + function KeyboardSettingsCtrl(IS_ELECTRON, LS_DEFAULTS) { let vm = this; const IPC_REGISTER_GLOBAL_SHORTCUT_EVENT = 'REGISTER_GLOBAL_SHORTCUT'; @@ -40,6 +40,10 @@ window.ipcRenderer.send(IPC_REGISTER_GLOBAL_SHORTCUT_EVENT, globalShowHide); } }; + + vm.resetAllShortcuts = () => { + vm.keys = LS_DEFAULTS.keys; + }; } })();