flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2026-01-11 20:55:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

now makeFileLoader(..) has default value and error andler arguments...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-12-28 08:57:11 +04:00
parent 16ef5b2f07
commit dcb734308e
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/bookmarks.js
View File

@ -111,9 +111,10 @@ var loadFileBookmarks = makeFileLoader(
'Bookmarks', 'Bookmarks',
BOOKMARKS_FILE_DEFAULT, BOOKMARKS_FILE_DEFAULT,
BOOKMARKS_FILE_PATTERN, BOOKMARKS_FILE_PATTERN,
[[], {}],
function(data){ function(data){
BOOKMARKS = data[0] == null ? [] : data[0] BOOKMARKS = data[0]
BOOKMARKS_DATA = data[1] == null ? {} : data[1] BOOKMARKS_DATA = data[1]
}) })

9
ui/files.js
View File

@ -205,7 +205,7 @@ function loadLatestFile(path, dfl, pattern, diff_pattern, default_data){
} }
function makeFileLoader(title, file_dfl, file_pattern, set_data, evt_name, skip_reg){ function makeFileLoader(title, file_dfl, file_pattern, default_data, set_data, error, evt_name, skip_reg){
var _loader = function(path){ var _loader = function(path){
var res = $.Deferred() var res = $.Deferred()
// default locations... // default locations...
@ -215,7 +215,7 @@ function makeFileLoader(title, file_dfl, file_pattern, set_data, evt_name, skip_
file_dfl, file_dfl,
file_pattern, file_pattern,
null, null,
[]) default_data)
// explicit path... // explicit path...
// XXX need to account for paths without a CONFIG.cache_dir // XXX need to account for paths without a CONFIG.cache_dir
@ -230,13 +230,16 @@ function makeFileLoader(title, file_dfl, file_pattern, set_data, evt_name, skip_
path.split(base)[0], path.split(base)[0],
RegExp(path.split(base)[0]), RegExp(path.split(base)[0]),
null, null,
[]) default_data)
} }
bubbleProgress(title, loader, res) bubbleProgress(title, loader, res)
res.done(set_data) res.done(set_data)
if(error != null){
res.fail(error)
}
if(evt_name != null){ if(evt_name != null){
res.done(function(){ $('.viewer').trigger(evt_name) }) res.done(function(){ $('.viewer').trigger(evt_name) })
} }

1
ui/marks.js
View File

@ -566,6 +566,7 @@ var loadFileMarks = makeFileLoader(
'Marks', 'Marks',
MARKED_FILE_DEFAULT, MARKED_FILE_DEFAULT,
MARKED_FILE_PATTERN, MARKED_FILE_PATTERN,
[],
function(data){ function(data){
// set the MARKED... // set the MARKED...
MARKED = data MARKED = data

12
ui/tags.js
View File

@ -469,8 +469,18 @@ var loadFileTags = makeFileLoader(
'Tags', 'Tags',
TAGS_FILE_DEFAULT, TAGS_FILE_DEFAULT,
TAGS_FILE_PATTERN, TAGS_FILE_PATTERN,
false,
function(data){ function(data){
TAGS = data.length != null ? {} : data //TAGS = data.length != null ? {} : data
if(data === false){
var t0 = Date.now()
buildTagsFromImages()
var t1 = Date.now()
console.warn('Tags: build tags.json: done ('+( t1 - t0 )+'ms) -- re-save the data.')
} else {
TAGS = data
}
}) })