flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-12-26 13:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: flynx:4dad475e8cd9fa1a67caf6845357e975c3c810cb
Branches Tags
flynx:master
flynx:new-ribbon-backend
flynx:release-latest
flynx:gen4-32123-lines
..
compare: flynx:bc43cf7614b9165c4ea7d6ab5e8fdfc73c56eb4e
Branches Tags
flynx:master
flynx:new-ribbon-backend
flynx:release-latest
flynx:gen4-32123-lines

No commits in common. "4dad475e8cd9fa1a67caf6845357e975c3c810cb" and "bc43cf7614b9165c4ea7d6ab5e8fdfc73c56eb4e" have entirely different histories.
4dad475e8c ... bc43cf7614

2 changed files with 3223 additions and 607 deletions
Show Stats Expand all files Collapse all files

7
Viewer/features/filesystem.js
View File

@ -488,6 +488,7 @@ var FileSystemLoaderActions = actions.Actions({
path = util.normalizePath(path) path = util.normalizePath(path)
// progress... // progress...
// XXX this does not appear to run while glob(..) is running...
var found = [] var found = []
var update_interval var update_interval
if(logger){ if(logger){
@ -496,7 +497,7 @@ var FileSystemLoaderActions = actions.Actions({
update_interval = setInterval(function(){ update_interval = setInterval(function(){
found.length > 0 found.length > 0
&& logger.emit('found', found) && logger.emit('found', found)
&& (found = []) }, 50) } && (found = []) }, 150) }
// get the image list... // get the image list...
return new Promise(function(resolve, reject){ return new Promise(function(resolve, reject){
@ -518,14 +519,14 @@ var FileSystemLoaderActions = actions.Actions({
console.error(err) console.error(err)
reject(err) }) reject(err) })
.on('end', function(){ .on('end', function(){
// XXX do we need to have two copies of the list???
var lst = found.slice()
update_interval update_interval
&& clearInterval(update_interval) && clearInterval(update_interval)
logger && found.length > 0 logger && found.length > 0
&& logger.emit('found', found) && logger.emit('found', found)
&& (found = []) && (found = [])
var lst = Object.keys(files)
// XXX might be a good idea to make image paths relative to path... // XXX might be a good idea to make image paths relative to path...
//lst = lst.map(function(p){ return pathlib.relative(base, p) }) //lst = lst.map(function(p){ return pathlib.relative(base, p) })
// XXX do we need to normalize paths after we get them from glob?? // XXX do we need to normalize paths after we get them from glob??

3823
Viewer/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff