From 915159d7a0ff30f65deb7eb9fcfe17d3aae4cd25 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 29 Aug 2013 15:56:37 -0700 Subject: [PATCH] Fix pane:became-inactive and pane:became-active events --- spec/pane-spec.coffee | 9 ++++++--- src/pane.coffee | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/spec/pane-spec.coffee b/spec/pane-spec.coffee index 37defec23..c434a38a4 100644 --- a/spec/pane-spec.coffee +++ b/spec/pane-spec.coffee @@ -507,9 +507,10 @@ describe "Pane", -> expect(focusHandler).toHaveBeenCalled() it "triggers 'pane:became-active' if it was not previously active", -> - becameActiveHandler = jasmine.createSpy("becameActiveHandler") - container.on 'pane:became-active', becameActiveHandler + pane2 = pane.splitRight(view2) # Make pane inactive + becameActiveHandler = jasmine.createSpy("becameActiveHandler") + pane.on 'pane:became-active', becameActiveHandler expect(pane.isActive()).toBeFalsy() pane.focusin() expect(pane.isActive()).toBeTruthy() @@ -518,8 +519,10 @@ describe "Pane", -> expect(becameActiveHandler.callCount).toBe 1 it "triggers 'pane:became-inactive' when it was previously active", -> + pane2 = pane.splitRight(view2) # Make pane inactive + becameInactiveHandler = jasmine.createSpy("becameInactiveHandler") - container.on 'pane:became-inactive', becameInactiveHandler + pane.on 'pane:became-inactive', becameInactiveHandler expect(pane.isActive()).toBeFalsy() pane.focusin() diff --git a/src/pane.coffee b/src/pane.coffee index 2523fc762..9517aa0d0 100644 --- a/src/pane.coffee +++ b/src/pane.coffee @@ -99,9 +99,9 @@ class Pane extends View # Public: Focus this pane. makeActive: -> + wasActive = @isActive() for pane in @getContainer().getPanes() when pane isnt this pane.makeInactive() - wasActive = @isActive() @addClass('active') @trigger 'pane:became-active' unless wasActive