From e76169e5a9ace84da87c8d7c2bf362a5d636f641 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Tue, 20 Nov 2012 16:37:59 -0700 Subject: [PATCH] Tab text is "untitled" if the buffer has no path --- src/extensions/tabs/spec/tabs-spec.coffee | 8 +++++++- src/extensions/tabs/src/tab.coffee | 9 ++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/extensions/tabs/spec/tabs-spec.coffee b/src/extensions/tabs/spec/tabs-spec.coffee index b64d7cab5..cb0829b90 100644 --- a/src/extensions/tabs/spec/tabs-spec.coffee +++ b/src/extensions/tabs/spec/tabs-spec.coffee @@ -54,6 +54,12 @@ describe "Tabs", -> expect(tabs.find('.tab').length).toBe 3 expect(tabs.find('.tab:eq(2) .file-name').text()).toBe 'two-hundred.txt' + describe "when the edit session's buffer has an undefined path", -> + it "makes the tab text 'untitled'", -> + rootView.open() + expect(tabs.find('.tab').length).toBe 3 + expect(tabs.find('.tab:eq(2) .file-name').text()).toBe 'untitled' + describe "when an edit session is removed", -> it "removes the tab for the removed edit session", -> editor.setActiveEditSessionIndex(0) @@ -80,6 +86,6 @@ describe "Tabs", -> afterEach -> fs.remove(newPath) - fit "updates the file name in the tab", -> + it "updates the file name in the tab", -> buffer.saveAs(newPath) expect(tabs.find('.tab:first .file-name')).toHaveText "foobar.js" diff --git a/src/extensions/tabs/src/tab.coffee b/src/extensions/tabs/src/tab.coffee index b002d47a8..af72f45f1 100644 --- a/src/extensions/tabs/src/tab.coffee +++ b/src/extensions/tabs/src/tab.coffee @@ -4,8 +4,11 @@ module.exports = class Tab extends View @content: (editSession) -> @div class: 'tab', => - @div editSession.buffer.getBaseName(), class: 'file-name', outlet: 'fileName' + @div class: 'file-name', outlet: 'fileName' initialize: (@editSession) -> - @editSession.on 'buffer-path-change.tab', => - @fileName.text(@editSession.buffer.getBaseName()) + @updateFileName() + @editSession.on 'buffer-path-change.tab', => @updateFileName() + + updateFileName: -> + @fileName.text(@editSession.buffer.getBaseName() ? 'untitled')