From 81462d9050df2c383385a746f45d20462b992bb9 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Mon, 6 May 2013 16:53:23 -0700
Subject: [PATCH] Hide/show entire loading area instead of only message

---
 src/app/select-list.coffee                         | 14 ++++++++------
 .../symbols-view/spec/symbols-view-spec.coffee     | 10 +++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/app/select-list.coffee b/src/app/select-list.coffee
index 85044f765..15a8bc68e 100644
--- a/src/app/select-list.coffee
+++ b/src/app/select-list.coffee
@@ -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?
diff --git a/src/packages/symbols-view/spec/symbols-view-spec.coffee b/src/packages/symbols-view/spec/symbols-view-spec.coffee
index f8f87cdb5..140024b8c 100644
--- a/src/packages/symbols-view/spec/symbols-view-spec.coffee
+++ b/src/packages/symbols-view/spec/symbols-view-spec.coffee
@@ -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'