github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 22:08:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Moving up in tree view doesn't skip over files inside of directories

Browse Source
This commit is contained in:
Corey Johnson
2012-05-04 14:56:41 -07:00
parent 37438c6da8
commit 2229c4be21
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spec/extensions/tree-view-spec.coffee
View File

@@ -197,6 +197,16 @@ describe "TreeView", ->
treeView.trigger 'move-up'
expect(treeView.root.find('.entry:last')).toHaveClass 'selected'
describe "when there is an expanded directory before the currently selected entry", ->
it "selects the last entry in the expanded directory", ->
lastDir = treeView.root.find('.directory:last').view()
fileAfterDir = lastDir.next().view()
lastDir.expand()
fileAfterDir.click()
treeView.trigger 'move-up'
expect(lastDir.find('.entry:last')).toHaveClass 'selected'
describe "when there is an entry before the currently selected entry", ->
it "selects the previous entry", ->
lastEntry = treeView.root.find('.entry:last')
@@ -212,7 +222,6 @@ describe "TreeView", ->
subdir.expand()
subdir.find('> .entries > .entry:first').click()
treeView.trigger 'move-up'
expect(subdir).toHaveClass 'selected'

7
src/extensions/tree-view/tree-view.coffee
View File

@@ -85,8 +85,11 @@ class TreeView extends View
moveUp: ->
selectedEntry = @selectedEntry()
if selectedEntry
return if @selectEntry(selectedEntry.prev())
return if @selectEntry(selectedEntry.parents('.directory').first())
if previousEntry = @selectEntry(selectedEntry.prev())
if previousEntry.is('.expanded.directory')
@selectEntry(previousEntry.find('.entry:last'))
else
@selectEntry(selectedEntry.parents('.directory').first())
else
@selectEntry(@find('.entry').last())