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

Hide/show entire loading area instead of only message

Browse Source
This commit is contained in:
Kevin Sawicki
2013-05-06 16:53:23 -07:00
parent 919bdca8f4
commit 81462d9050
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/select-list.coffee
View File

@@ -59,8 +59,8 @@ class SelectList extends View
@populateList()
@setLoading()
setError: (message) ->
if not message or message.length == ""
setError: (message='') ->
if message.length is 0
@error.text("").hide()
@removeClass("error")
else
@@ -68,12 +68,14 @@ class SelectList extends View
@error.text(message).show()
@addClass("error")
setLoading: (message) ->
if not message or message.length == ""
@loading.text("").hide()
setLoading: (message='') ->
if message.length is 0
@loading.text("")
@loadingArea.hide()
else
@setError()
@loading.text(message).show()
@loading.text(message)
@loadingArea.show()
populateList: ->
return unless @array?

10
src/packages/symbols-view/spec/symbols-view-spec.coffee
View File

@@ -21,13 +21,13 @@ describe "SymbolsView", ->
rootView.open('sample.js')
rootView.getActiveView().trigger "symbols-view:toggle-file-symbols"
symbolsView = rootView.find('.symbols-view').view()
expect(symbolsView.find('.loading')).toHaveText 'Generating symbols...'
expect(symbolsView.loading).toHaveText 'Generating symbols...'
waitsFor ->
setArraySpy.callCount > 0
runs ->
expect(symbolsView.find('.loading')).toBeEmpty()
expect(symbolsView.loading).toBeEmpty()
expect(rootView.find('.symbols-view')).toExist()
expect(symbolsView.list.children('li').length).toBe 2
expect(symbolsView.list.children('li:first').find('.primary-line')).toHaveText 'quicksort'
@@ -79,7 +79,7 @@ describe "SymbolsView", ->
expect(symbolsView.error).toBeVisible()
expect(symbolsView.error.text().length).toBeGreaterThan 0
expect(symbolsView).toHaveClass "error"
expect(symbolsView.find('.loading')).not.toBeVisible()
expect(symbolsView.loadingArea).not.toBeVisible()
it "moves the cursor to the selected function", ->
tags = []
@@ -183,13 +183,13 @@ describe "SymbolsView", ->
expect(rootView.find('.symbols-view')).not.toExist()
rootView.trigger "symbols-view:toggle-project-symbols"
symbolsView = rootView.find('.symbols-view').view()
expect(symbolsView.find('.loading')).toHaveText 'Loading symbols...'
expect(symbolsView.loading).toHaveText 'Loading symbols...'
waitsFor ->
setArraySpy.callCount > 0
runs ->
expect(symbolsView.find('.loading')).toBeEmpty()
expect(symbolsView.loading).toBeEmpty()
expect(rootView.find('.symbols-view')).toExist()
expect(symbolsView.list.children('li').length).toBe 4
expect(symbolsView.list.children('li:first').find('.primary-line')).toHaveText 'callMeMaybe'