From 7867d0cb3bf9ca4263afffff6a6adf7ac066a643 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Sat, 2 Feb 2013 16:55:51 -0700 Subject: [PATCH 1/2] Fix spec for 'focused' to 'is-focused' class rename. --- spec/app/text-mate-theme-spec.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/app/text-mate-theme-spec.coffee b/spec/app/text-mate-theme-spec.coffee index e1c04ec90..b2f6e54fe 100644 --- a/spec/app/text-mate-theme-spec.coffee +++ b/spec/app/text-mate-theme-spec.coffee @@ -27,12 +27,12 @@ describe "TextMateTheme", -> 'color': '#F8F8F8' expect(rulesets[1]).toEqual - selector: '.editor.focused .cursor' + selector: '.editor.is-focused .cursor' properties: 'border-color': '#A7A7A7' expect(rulesets[2]).toEqual - selector: '.editor.focused .selection .region' + selector: '.editor.is-focused .selection .region' properties: 'background-color': "rgba(221, 240, 255, 0.2)" From 94f1630152713fc8b6d4b2fc0673e8c1053f84e6 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Sat, 2 Feb 2013 17:02:07 -0700 Subject: [PATCH 2/2] Bind window `focus` and `focusout` events separately to fix spec --- spec/app/window-spec.coffee | 4 ++-- src/app/window.coffee | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spec/app/window-spec.coffee b/spec/app/window-spec.coffee index c8a61920b..d9adc3170 100644 --- a/spec/app/window-spec.coffee +++ b/spec/app/window-spec.coffee @@ -17,8 +17,8 @@ describe "Window", -> it "has .is-focused on the body tag", -> expect($("body").hasClass("is-focused")).toBe true - it "doesn't have .is-focused on the window blur", -> - $(window).blur() + it "doesn't have .is-focused on the window focousout event", -> + $(window).focusout() expect($("body").hasClass("is-focused")).toBe false describe ".close()", -> diff --git a/src/app/window.coffee b/src/app/window.coffee index d0cad8b32..d5dca5965 100644 --- a/src/app/window.coffee +++ b/src/app/window.coffee @@ -28,7 +28,8 @@ windowAdditions = $(window).on 'core:close', => @close() $(window).command 'window:close', => @close() - $(window).on 'focus blur', => $("body").toggleClass("is-focused") + $(window).on 'focus', => $("body").addClass("is-focused") + $(window).on 'focusout', => $("body").removeClass("is-focused") # This method is intended only to be run when starting a normal application # Note: RootView assigns itself on window on initialization so that