From 09d9936aed96c53e31c9e2056ff5310d7d6e2ee6 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 14 Feb 2018 09:54:07 +0000 Subject: [PATCH] Change remote-diff shortcut and add it to keymap Fixes #1628 --- editor/js/keymap.json | 2 +- editor/js/ui/diff.js | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/editor/js/keymap.json b/editor/js/keymap.json index 4b7eb6b35..08f83b4a5 100644 --- a/editor/js/keymap.json +++ b/editor/js/keymap.json @@ -14,7 +14,7 @@ "ctrl-i": "core:show-import-dialog", "ctrl-space": "core:toggle-sidebar", "ctrl-,": "core:show-user-settings", - + "ctrl-alt-r": "core:show-remote-diff", "ctrl-alt-n": "core:new-project", "ctrl-alt-o": "core:open-project", "ctrl-g v": "core:show-version-control-tab" diff --git a/editor/js/ui/diff.js b/editor/js/ui/diff.js index 2cc6d8027..b64c7ba91 100644 --- a/editor/js/ui/diff.js +++ b/editor/js/ui/diff.js @@ -9,16 +9,16 @@ RED.diff = (function() { // RED.actions.add("core:show-current-diff",showLocalDiff); RED.actions.add("core:show-remote-diff",showRemoteDiff); // RED.keyboard.add("*","ctrl-shift-l","core:show-current-diff"); - RED.keyboard.add("*","ctrl-shift-r","core:show-remote-diff"); + // RED.keyboard.add("*","ctrl-shift-r","core:show-remote-diff"); - RED.actions.add("core:show-test-flow-diff-1",function(){showTestFlowDiff(1)}); - RED.keyboard.add("*","ctrl-shift-f 1","core:show-test-flow-diff-1"); - - RED.actions.add("core:show-test-flow-diff-2",function(){showTestFlowDiff(2)}); - RED.keyboard.add("*","ctrl-shift-f 2","core:show-test-flow-diff-2"); - RED.actions.add("core:show-test-flow-diff-3",function(){showTestFlowDiff(3)}); - RED.keyboard.add("*","ctrl-shift-f 3","core:show-test-flow-diff-3"); + // RED.actions.add("core:show-test-flow-diff-1",function(){showTestFlowDiff(1)}); + // RED.keyboard.add("*","ctrl-shift-f 1","core:show-test-flow-diff-1"); + // + // RED.actions.add("core:show-test-flow-diff-2",function(){showTestFlowDiff(2)}); + // RED.keyboard.add("*","ctrl-shift-f 2","core:show-test-flow-diff-2"); + // RED.actions.add("core:show-test-flow-diff-3",function(){showTestFlowDiff(3)}); + // RED.keyboard.add("*","ctrl-shift-f 3","core:show-test-flow-diff-3"); } function createDiffTable(container,CurrentDiff) {