flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-11-03 21:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

relative paths appear to be working...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-05-26 02:55:41 +04:00
parent cc1d88771e
commit c286950508
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/data.js
View File

@ -17,6 +17,8 @@ var MAX_SCREEN_IMAGES = 12
// title attr.
var IMAGE_TITLE_DATA = true
var CACHE_DIR = '.ImageGridCache'
// A stub image, also here for documentation...
var STUB_IMAGE_DATA = {
id: 'SIZE',
@ -374,7 +376,7 @@ function updateImage(image, gid, size){
var preview = getBestPreview(gid, size)
image
.css({
'background-image': 'url('+ preview.url +')',
'background-image': 'url("'+ preview.url +'")',
})
.attr({
order: DATA.order.indexOf(gid),
@ -751,9 +753,12 @@ function loadFileImages(path, callback){
// XXX add relative path support (via. normalizePath(...))
function loadFile(data_path, image_path, callback){
var base = data_path.split(CACHE_DIR)[0]
base = base == data_path ? '.' : base
// CEF
return $.getJSON(data_path)
.done(function(json){
BASE_URL = base
// legacy format...
if(json.version == null){
json = convertDataGen1(json)
@ -768,14 +773,14 @@ function loadFile(data_path, image_path, callback){
} else if(json.version == '2.0') {
DATA = json
if(image_path != null){
loadFileImages(image_path)
loadFileImages(normalizePath(image_path, base))
.done(function(){
loadData()
callback != null && callback()
})
} else if(DATA.image_file != null) {
loadFileImages(DATA.image_file)
loadFileImages(normalizePath(DATA.image_file, base))
.done(function(){
loadData()