github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 06:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Status bar only updates modified flag after buffer *stops* changing

Browse Source
This commit is contained in:
Nathan Sobo
2012-11-14 15:34:11 -07:00
parent 4a84c5f8f9
commit 5dea68bb4c
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spec/app/status-bar-spec.coffee
View File

@@ -15,10 +15,6 @@ describe "StatusBar", ->
statusBar = rootView.find('.status-bar').view()
buffer = editor.getBuffer()
# updating the status bar is asynchronous for performance reasons
# for testing purposes, make it synchronous
spyOn(_, 'delay').andCallFake (fn) -> fn()
afterEach ->
rootView.remove()
@@ -56,6 +52,7 @@ describe "StatusBar", ->
it "enables the buffer modified indicator", ->
expect(statusBar.bufferModified.text()).toBe ''
editor.insertText("\n")
advanceClock(buffer.stoppedChangingDelay)
expect(statusBar.bufferModified.text()).toBe '*'
editor.backspace()
@@ -66,6 +63,7 @@ describe "StatusBar", ->
rootView.open(path)
expect(statusBar.bufferModified.text()).toBe ''
editor.insertText("\n")
advanceClock(buffer.stoppedChangingDelay)
expect(statusBar.bufferModified.text()).toBe '*'
editor.save()
expect(statusBar.bufferModified.text()).toBe ''
@@ -73,15 +71,19 @@ describe "StatusBar", ->
it "disables the buffer modified indicator if the content matches again", ->
expect(statusBar.bufferModified.text()).toBe ''
editor.insertText("\n")
advanceClock(buffer.stoppedChangingDelay)
expect(statusBar.bufferModified.text()).toBe '*'
editor.backspace()
advanceClock(buffer.stoppedChangingDelay)
expect(statusBar.bufferModified.text()).toBe ''
it "disables the buffer modified indicator when the change is undone", ->
expect(statusBar.bufferModified.text()).toBe ''
editor.insertText("\n")
advanceClock(buffer.stoppedChangingDelay)
expect(statusBar.bufferModified.text()).toBe '*'
editor.undo()
advanceClock(buffer.stoppedChangingDelay)
expect(statusBar.bufferModified.text()).toBe ''
describe "when the buffer changes", ->
@@ -89,6 +91,7 @@ describe "StatusBar", ->
expect(statusBar.bufferModified.text()).toBe ''
rootView.open(require.resolve('fixtures/sample.txt'))
editor.insertText("\n")
advanceClock(buffer.stoppedChangingDelay)
expect(statusBar.bufferModified.text()).toBe '*'
it "doesn't update the buffer modified indicator for the old buffer", ->
@@ -96,6 +99,7 @@ describe "StatusBar", ->
expect(statusBar.bufferModified.text()).toBe ''
rootView.open(require.resolve('fixtures/sample.txt'))
oldBuffer.setText("new text")
advanceClock(buffer.stoppedChangingDelay)
expect(statusBar.bufferModified.text()).toBe ''
describe "when the associated editor's cursor position changes", ->

6
src/app/status-bar.coffee
View File

@@ -42,9 +42,9 @@ class StatusBar extends View
subscribeToBuffer: ->
@buffer?.off '.status-bar'
@buffer = @editor.getBuffer()
@buffer.on 'change.status-bar', => _.delay (=> @updateBufferModifiedText()), 50
@buffer.on 'after-save.status-bar', => _.delay (=> @updateStatusBar()), 50
@buffer.on 'git-status-change.status-bar', => _.delay (=> @updateStatusBar()), 50
@buffer.on 'stopped-changing.status-bar', => @updateBufferModifiedText()
@buffer.on 'after-save.status-bar', => @updateStatusBar()
@buffer.on 'git-status-change.status-bar', => @updateStatusBar()
@updateStatusBar()
updateStatusBar: ->