mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-20 23:48:05 +03:00
Merge branch 'dev' into better-anchors
This commit is contained in:
commit
d144dd4efe
@ -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)"
|
||||
|
||||
|
@ -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()", ->
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user