mirror of
https://github.com/atom/atom.git
synced 2026-01-21 12:57:55 -05:00
Show number of paths loaded after indexing message
This commit is contained in:
@@ -13,7 +13,8 @@ class SelectList extends View
|
||||
@subview 'miniEditor', new Editor(mini: true)
|
||||
@div class: 'error', outlet: 'error'
|
||||
@div class: 'loading', outlet: 'loadingArea', =>
|
||||
@span outlet: 'loading'
|
||||
@span class: 'loading-message', outlet: 'loading'
|
||||
@span class: 'badge', outlet: 'loadingBadge'
|
||||
@ol outlet: 'list'
|
||||
|
||||
@viewClass: -> 'select-list'
|
||||
@@ -71,6 +72,7 @@ class SelectList extends View
|
||||
setLoading: (message='') ->
|
||||
if message.length is 0
|
||||
@loading.text("")
|
||||
@loadingBadge.text("")
|
||||
@loadingArea.hide()
|
||||
else
|
||||
@setError()
|
||||
|
||||
@@ -148,7 +148,8 @@ class FuzzyFinderView extends SelectList
|
||||
@setArray(listedItems)
|
||||
options.done(listedItems) if options.done?
|
||||
else
|
||||
@setLoading("Indexing...")
|
||||
@setLoading("Indexing project...")
|
||||
@loadingBadge.text("")
|
||||
|
||||
if @reloadProjectPaths
|
||||
@loadPathsTask?.abort()
|
||||
@@ -157,6 +158,8 @@ class FuzzyFinderView extends SelectList
|
||||
@reloadProjectPaths = false
|
||||
@populateProjectPaths(options)
|
||||
@loadPathsTask = new LoadPathsTask(callback)
|
||||
@loadPathsTask.on 'paths-loaded', (paths) =>
|
||||
@loadingBadge.text(paths.length)
|
||||
@loadPathsTask.start()
|
||||
|
||||
populateOpenBufferPaths: ->
|
||||
|
||||
@@ -14,6 +14,7 @@ class LoadPathsTask extends Task
|
||||
|
||||
pathsLoaded: (paths) ->
|
||||
@paths.push(paths...)
|
||||
@trigger 'paths-loaded', @paths
|
||||
|
||||
pathLoadingComplete: ->
|
||||
@callback(@paths)
|
||||
|
||||
@@ -46,7 +46,7 @@ describe 'FuzzyFinder', ->
|
||||
rootView.trigger 'fuzzy-finder:toggle-file-finder'
|
||||
paths = null
|
||||
expect(finderView.find(".loading")).toBeVisible()
|
||||
expect(finderView.find(".loading")).toHaveText "Indexing..."
|
||||
expect(finderView.find(".loading").text().length).toBeGreaterThan 0
|
||||
|
||||
waitsFor "all project paths to load", 5000, ->
|
||||
unless finderView.reloadProjectPaths
|
||||
|
||||
@@ -6,22 +6,18 @@
|
||||
}
|
||||
|
||||
.loading {
|
||||
text-align: center;
|
||||
.loading-message:before {
|
||||
font-family: 'Octicons Regular';
|
||||
font-size: 1.1em;
|
||||
width: 1.1em;
|
||||
height: 1.1em;
|
||||
margin-right: 5px;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
content: '\f09e';
|
||||
}
|
||||
|
||||
span {
|
||||
padding: 5px 10px 5px 10px;
|
||||
text-align: center;
|
||||
border-radius: 3px;
|
||||
|
||||
&:before {
|
||||
font-family: 'Octicons Regular';
|
||||
font-size: 1.1em;
|
||||
width: 1.1em;
|
||||
height: 1.1em;
|
||||
margin-right: 5px;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
content: '\f09e';
|
||||
}
|
||||
.badge {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,13 +6,6 @@
|
||||
|
||||
.loading {
|
||||
color: #ccc;
|
||||
|
||||
span {
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
border-top: 1px solid rgba(0, 0, 0, 1);
|
||||
border-left: 1px solid rgba(0, 0, 0, 1);
|
||||
background-color: #111;
|
||||
}
|
||||
}
|
||||
|
||||
ol {
|
||||
|
||||
@@ -11,11 +11,6 @@
|
||||
|
||||
.loading {
|
||||
color: #333;
|
||||
|
||||
span {
|
||||
border: 1px solid rgba(0, 0, 0, 0.1);
|
||||
background-color: #dedede;
|
||||
}
|
||||
}
|
||||
|
||||
ol {
|
||||
|
||||
Reference in New Issue
Block a user