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

more 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:41:51 +04:00
parent 8695b62a02
commit 4e76cbbb60
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ui/data.js
View File

@ -656,8 +656,12 @@ function loadFileImages(path, callback){
callback != null && callback() callback != null && callback()
}) })
.fail(function(){
console.error('ERROR LOADING:', path)
})
} }
function loadFile(data_path, image_path, callback){ function loadFile(data_path, image_path, callback){
// CEF // CEF
return $.getJSON(data_path) return $.getJSON(data_path)
@ -695,8 +699,12 @@ function loadFile(data_path, image_path, callback){
return return
} }
}) })
.fail(function(){
console.error('ERROR LOADING:', data_path)
})
} }
function saveFile(name){ function saveFile(name){
// CEF // CEF
if(window.CEF_dumpJSON != null){ if(window.CEF_dumpJSON != null){
@ -716,7 +724,7 @@ function saveFile(name){
function openImage(){ function openImage(){
// CEF // CEF
if(window.CEF_dumpJSON != null){ if(window.CEF_runSystem != null){
// XXX if path is not present try and open the biggest preview... // XXX if path is not present try and open the biggest preview...
return CEF_runSystem(IMAGES[getImageGID()].path) return CEF_runSystem(IMAGES[getImageGID()].path)
@ -727,20 +735,18 @@ function openImage(){
} }
// XXX need revision...
function loadDir(path){ function loadDir(path){
// CEF return loadFile(path +'/data.json')
if(window.CEF_loadDir != null){ .fail(function(){
var dir = CEF_loadDir(path) loadFile(path +'/.ImageGrindCache/data.json')
IMAGES = dir.images .fail(function(){
DATA = dir.data // XXX load separate images...
MARKED = dir.marked
loadData()
// PhoneGap
} else if(false) {
// XXX // XXX
})
})
} }
}
/********************************************************************** /**********************************************************************

17
ui/index.html
View File

@ -343,19 +343,10 @@ $(function(){
// we have an image file... // we have an image file...
if((DATA_ATTR + '_IMAGES_FILE') in localStorage){ if((DATA_ATTR + '_IMAGES_FILE') in localStorage){
loadFileImages(localStorage[DATA_ATTR + '_IMAGES_FILE']) var loading = loadFileImages(localStorage[DATA_ATTR + '_IMAGES_FILE'])
.done(function(){ .done(function(){
DATA = loadLocalStorageData() DATA = loadLocalStorageData()
loadData() loadData()
// XXX this will reload everything...
if('MARKED' in localStorage){
loadLocalStorageMarks()
}
// XXX stub...
//centerView(focusImage($('.image').first()), 'css')
updateImages()
}) })
} else { } else {
@ -370,7 +361,11 @@ $(function(){
IMAGES = DATA.images IMAGES = DATA.images
loadData() loadData()
} }
var loading = $.Deferred().resolve()
}
loading
.done(function(){
// XXX this will reload everything... // XXX this will reload everything...
if('MARKED' in localStorage){ if('MARKED' in localStorage){
loadLocalStorageMarks() loadLocalStorageMarks()
@ -379,7 +374,7 @@ $(function(){
// XXX stub... // XXX stub...
//centerView(focusImage($('.image').first()), 'css') //centerView(focusImage($('.image').first()), 'css')
updateImages() updateImages()
} })