flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-30 02:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor tweaks...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-05-22 03:10:24 +04:00
parent 04e4e6ccb8
commit 8695b62a02
1 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
ui/data.js
View File

@ -648,48 +648,53 @@ function saveLocalStorageMarks(attr){
*/ */
function loadFileImages(path, callback){ function loadFileImages(path, callback){
return $.getJSON(path, function(json){ return $.getJSON(path)
IMAGES = json .done(function(json){
localStorage[DATA_ATTR + '_IMAGES_FILE'] = path IMAGES = json
console.log('Loaded IMAGES...') localStorage[DATA_ATTR + '_IMAGES_FILE'] = path
console.log('Loaded IMAGES...')
callback != null && callback() callback != null && callback()
}) })
} }
function loadFile(data_path, image_path, callback){ function loadFile(data_path, image_path, callback){
// CEF // CEF
return $.getJSON(data_path, function(json){ return $.getJSON(data_path)
// legacy format... .done(function(json){
if(json.version == null){ // legacy format...
json = convertDataGen1(json) if(json.version == null){
DATA = json.data json = convertDataGen1(json)
IMAGES = json.images DATA = json.data
loadData() IMAGES = json.images
loadData()
// version 2.0 // version 2.0
// XXX needs a more flexible protocol... // XXX needs a more flexible protocol...
} else if(json.version == '2.0') { } else if(json.version == '2.0') {
DATA = json DATA = json
if(image_path != null){ if(image_path != null){
loadFileImages(image_path, function(){ loadFileImages(image_path)
loadData() .done(function(){
loadData()
callback != null && callback() callback != null && callback()
}) })
} else if(DATA.image_file != null) { } else if(DATA.image_file != null) {
loadFileImages(DATA.image_file, function(){ loadFileImages(DATA.image_file)
loadData() .done(function(){
loadData()
callback != null && callback() callback != null && callback()
}) })
}
// unknown format...
} else {
console.error('unknown format.')
return
} }
})
} else {
console.error('unknown format.')
return
}
})
} }
function saveFile(name){ function saveFile(name){