From a6f32c7eadacd571d8cd442bc2d4c9e953b4cf58 Mon Sep 17 00:00:00 2001 From: Stefan Koller Date: Thu, 20 Oct 2016 14:07:04 +0200 Subject: [PATCH 1/2] compare on toggle + refocus prev window --- lib/git-control.coffee | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/git-control.coffee b/lib/git-control.coffee index 03e47de..4e3fd39 100644 --- a/lib/git-control.coffee +++ b/lib/git-control.coffee @@ -9,6 +9,7 @@ views = [] view = undefined pane = undefined item = undefined +lastItem = undefined module.exports = GitControl = @@ -26,21 +27,26 @@ module.exports = GitControl = toggleView: -> console.log 'GitControl: toggle' + pane = atom.workspace.getActivePane() unless view and view.active + lastItem = pane.getActiveItem() + view = new GitControlView() views.push view - pane = atom.workspace.getActivePane() item = pane.addItem view, 0 pane.activateItem item + view.compareMenuClick() else pane.destroyItem item + pane.activateItem lastItem return + updatePaths: -> git.setProjectIndex(0) return From 41a10b1e6567f1842c5a0eaef882cff7d5792a36 Mon Sep 17 00:00:00 2001 From: Stefan Koller Date: Thu, 20 Oct 2016 14:40:56 +0200 Subject: [PATCH 2/2] focus pane --- lib/git-control.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/git-control.coffee b/lib/git-control.coffee index 4e3fd39..eb12fc9 100644 --- a/lib/git-control.coffee +++ b/lib/git-control.coffee @@ -43,6 +43,8 @@ module.exports = GitControl = else pane.destroyItem item pane.activateItem lastItem + pane.activate() + return