Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

On second click, open without pending option #741

Closed
wants to merge 2 commits into from
Closed

On second click, open without pending option #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
902be14
On second click, open without `pending` option
kuychaco Feb 17, 2016
0f8432c
Update and fix specs for pending state
Feb 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions lib/tree-view.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,12 @@ class TreeView extends View
if entry.getPath() is atom.workspace.getActivePaneItem()?.getPath?()
@focus()
else
@openedItem = atom.workspace.open(entry.getPath(), pending: true)
atom.workspace.open(entry.getPath(), pending: true)
else if entry instanceof DirectoryView
entry.toggleExpansion(isRecursive)
when 2
if entry instanceof FileView
@openedItem.then((item) -> item.terminatePendingState?())
atom.workspace.open(entry.getPath())
unless entry.getPath() is atom.workspace.getActivePaneItem()?.getPath?()
@unfocus()
else if entry instanceof DirectoryView
Expand Down Expand Up @@ -392,11 +392,7 @@ class TreeView extends View
else
selectedEntry.toggleExpansion()
else if selectedEntry instanceof FileView
uri = selectedEntry.getPath()
item = atom.workspace.getActivePane()?.itemForURI(uri)
if item? and not options.pending
item.terminatePendingState?()
atom.workspace.open(uri, options)
atom.workspace.open(selectedEntry.getPath(), options)

openSelectedEntrySplit: (orientation, side) ->
selectedEntry = @selectedEntry()
Expand Down
14 changes: 7 additions & 7 deletions spec/tree-view-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ describe "TreeView", ->
sampleJs.mousedown()
expect(sampleJs).toHaveClass 'selected'

if atom.workspace.buildTextEditor().isPending?
if atom.workspace.getActivePane().getPendingItem?
describe "when files are clicked", ->
beforeEach ->
jasmine.attachToDOM(workspaceElement)
Expand All @@ -548,7 +548,7 @@ describe "TreeView", ->

it "opens it in the pane in pending state", ->
expect(activePaneItem.getPath()).toBe atom.project.getDirectories()[0].resolve('tree-view.js')
expect(activePaneItem.isPending()).toBe true
expect(atom.workspace.getActivePane().getPendingItem()).toEqual activePaneItem

it "changes the focus to the file", ->
expect(atom.views.getView(activePaneItem)).toHaveFocus()
Expand Down Expand Up @@ -584,18 +584,18 @@ describe "TreeView", ->

it "opens it in pending state on first click", ->
expect(activePaneItem.getPath()).toBe atom.project.getDirectories()[0].resolve('tree-view.js')
expect(activePaneItem.isPending()).toBe true
expect(atom.workspace.getActivePane().getPendingItem()).toEqual activePaneItem

it "terminates pending state on second click", ->
sampleJs.trigger clickEvent(originalEvent: {detail: 2})
waitsFor ->
activePaneItem.isPending() is false
atom.workspace.getActivePane().getPendingItem() isnt activePaneItem

it "does not create pending state on subsequent single click", ->
sampleJs.trigger clickEvent(originalEvent: {detail: 2})
sampleJs.trigger clickEvent(originalEvent: {detail: 1})
waitsFor ->
activePaneItem.isPending() is false
atom.workspace.getActivePane().getPendingItem() isnt activePaneItem

describe "when a file is single-clicked, then double-clicked", ->
activePaneItem = null
Expand All @@ -611,13 +611,13 @@ describe "TreeView", ->

it "opens it in pending state on single-click", ->
expect(activePaneItem.getPath()).toBe atom.project.getDirectories()[0].resolve('tree-view.js')
expect(activePaneItem.isPending()).toBe true
expect(atom.workspace.getActivePane().getPendingItem()).toEqual activePaneItem

it "terminates pending state on the double-click and focuses file", ->
sampleJs.trigger clickEvent(originalEvent: {detail: 2})
expect(atom.views.getView(activePaneItem)).toHaveFocus()
waitsFor ->
activePaneItem.isPending() is false
atom.workspace.getActivePane().getPendingItem() isnt activePaneItem

it "keeps focus on tree-view if the file is the active pane item", ->
sampleJs.trigger clickEvent(originalEvent: {detail: 1})
Expand Down