Rename restoreItem to reopenItem on pane container

This commit is contained in:
Corey Johnson & Nathan Sobo
2013-03-06 13:52:27 -08:00
committed by probablycorey
parent ffb8bcd71d
commit c1d19c4c5c
3 changed files with 11 additions and 9 deletions

View File

@@ -76,7 +76,7 @@ describe "PaneContainer", ->
pane4.splitDown()
expect(panes).toEqual []
describe ".restoreItem()", ->
describe ".reopenItem()", ->
describe "when there is an active pane", ->
it "reconstructs and shows the last-closed pane item", ->
expect(container.getActivePane()).toBe pane3
@@ -88,13 +88,13 @@ describe "PaneContainer", ->
pane3.destroyItem(item4)
expect(container.getActivePane()).toBe pane1
expect(container.restoreItem()).toBeTruthy()
expect(container.reopenItem()).toBeTruthy()
expect(pane1.activeItem).toEqual item4
expect(container.restoreItem()).toBeTruthy()
expect(container.reopenItem()).toBeTruthy()
expect(pane1.activeItem).toEqual item3
expect(container.restoreItem()).toBeFalsy()
expect(container.reopenItem()).toBeFalsy()
expect(pane1.activeItem).toEqual item3
describe "when there is no active pane", ->
@@ -105,7 +105,7 @@ describe "PaneContainer", ->
pane3.destroyItem(item3)
expect(container.getActivePane()).toBeUndefined()
container.restoreItem()
container.reopenItem()
expect(container.getActivePane().activeItem).toEqual item3
@@ -119,11 +119,11 @@ describe "PaneContainer", ->
expect(container.getActivePane()).toBe pane1
pane1.showItem(new TestView('4'))
expect(container.restoreItem()).toBeTruthy()
expect(container.reopenItem()).toBeTruthy()
expect(_.pluck(pane1.getItems(), 'name')).toEqual ['1', '4', '3']
expect(pane1.activeItem).toEqual item3
expect(container.restoreItem()).toBeFalsy()
expect(container.reopenItem()).toBeFalsy()
expect(pane1.activeItem).toEqual item3
describe ".saveAll()", ->

View File

@@ -37,7 +37,7 @@ class PaneContainer extends View
nextIndex = (currentIndex + 1) % panes.length
panes[nextIndex].makeActive()
restoreItem: ->
reopenItem: ->
if lastItemState = @destroyedItemStates.pop()
if activePane = @getActivePane()
activePane.showItem(deserialize(lastItemState))

View File

@@ -58,13 +58,15 @@ class RootView extends View
config.set("editor.showInvisibles", !config.get("editor.showInvisibles"))
@command 'window:toggle-ignored-files', =>
config.set("core.hideGitIgnoredFiles", not config.core.hideGitIgnoredFiles)
@command 'window:toggle-auto-indent', =>
config.set("editor.autoIndent", !config.get("editor.autoIndent"))
@command 'window:toggle-auto-indent-on-paste', =>
config.set("editor.autoIndentOnPaste", !config.get("editor.autoIndentOnPaste"))
@command 'pane:reopen-closed-item', =>
@panes.restoreItem()
@panes.reopenItem()
serialize: ->
deserializer: 'RootView'