mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-12-26 13:01:58 +00:00
Compare commits
No commits in common. "4dad475e8cd9fa1a67caf6845357e975c3c810cb" and "bc43cf7614b9165c4ea7d6ab5e8fdfc73c56eb4e" have entirely different histories.
4dad475e8c
...
bc43cf7614
@ -488,6 +488,7 @@ var FileSystemLoaderActions = actions.Actions({
|
||||
path = util.normalizePath(path)
|
||||
|
||||
// progress...
|
||||
// XXX this does not appear to run while glob(..) is running...
|
||||
var found = []
|
||||
var update_interval
|
||||
if(logger){
|
||||
@ -496,7 +497,7 @@ var FileSystemLoaderActions = actions.Actions({
|
||||
update_interval = setInterval(function(){
|
||||
found.length > 0
|
||||
&& logger.emit('found', found)
|
||||
&& (found = []) }, 50) }
|
||||
&& (found = []) }, 150) }
|
||||
|
||||
// get the image list...
|
||||
return new Promise(function(resolve, reject){
|
||||
@ -518,14 +519,14 @@ var FileSystemLoaderActions = actions.Actions({
|
||||
console.error(err)
|
||||
reject(err) })
|
||||
.on('end', function(){
|
||||
// XXX do we need to have two copies of the list???
|
||||
var lst = found.slice()
|
||||
update_interval
|
||||
&& clearInterval(update_interval)
|
||||
logger && found.length > 0
|
||||
&& logger.emit('found', found)
|
||||
&& (found = [])
|
||||
|
||||
var lst = Object.keys(files)
|
||||
|
||||
// XXX might be a good idea to make image paths relative to path...
|
||||
//lst = lst.map(function(p){ return pathlib.relative(base, p) })
|
||||
// XXX do we need to normalize paths after we get them from glob??
|
||||
|
||||
3823
Viewer/package-lock.json
generated
3823
Viewer/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user