flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2026-01-02 08:21:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

now loadFileImages accepts base, not just null or an explicit path...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-06-09 02:44:20 +04:00
parent 8159a27407
commit aee42a4370
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/files.js
View File

@ -251,6 +251,14 @@ function loadFileImages(path, no_load_diffs){
IMAGES_FILE_PATTERN, IMAGES_FILE_PATTERN,
IMAGES_DIFF_FILE_PATTERN) IMAGES_DIFF_FILE_PATTERN)
// explicit base dir...
} else if(!/\.json$/i.test(path)) {
var base = normalizePath(path +'/'+ CACHE_DIR)
var loader = loadLatestFile(base,
IMAGES_FILE_DEFAULT,
IMAGES_FILE_PATTERN,
IMAGES_DIFF_FILE_PATTERN)
// explicit path... // explicit path...
} else { } else {
var loader = loadLatestFile(normalizePath(path)) var loader = loadLatestFile(normalizePath(path))
@ -382,9 +390,10 @@ function loadFileState(path, prefix){
// XXX load config... // XXX load config...
// load images... // load images...
bubbleProgress(prefix, bubbleProgress(prefix,
loadFileImages(DATA.image_file != null ? loadFileImages(base), res, true),
normalizePath(DATA.image_file, base) //loadFileImages(DATA.image_file != null ?
: null), res, true), // normalizePath(DATA.image_file, base)
// : null), res, true),
// load marks if available... // load marks if available...
bubbleProgress(prefix, bubbleProgress(prefix,
loadFileMarks(), res, true)) loadFileMarks(), res, true))