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

fixed a bug in getGIDsAfter(..) + disabled caching as it appears to give no benifits...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-12-15 07:41:01 +04:00
parent 7603209627
commit 943f4ba4a0
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/data.js
View File

@ -1478,6 +1478,9 @@ function getGIDsAfter(count, gid, ribbon, inclusive, data){
} else { } else {
var c = inclusive == null ? 0 : 1 var c = inclusive == null ? 0 : 1
var end = ribbon.indexOf(gid) var end = ribbon.indexOf(gid)
// avoid -1 value that will wrap around the tail and load the
// whole ribbon...
end = end < 0 ? 0 : end
return ribbon.slice((Math.abs(count) >= end ? 0 : end + count + c), end + c) return ribbon.slice((Math.abs(count) >= end ? 0 : end + count + c), end + c)
} }
} }
@ -1807,14 +1810,14 @@ function preCacheRibbonImages(ribbon){
var i = getRibbonIndex(ribbon) var i = getRibbonIndex(ribbon)
var size = getVisibleImageSize('max') var size = getVisibleImageSize('max')
var screen_size = getScreenWidthInImages(getVisibleImageSize()) var screen_size = getScreenWidthInImages(getVisibleImageSize())
// XXX // XXX needs tuning...
var cache_frame_size = (screen_size * LOAD_SCREENS) / 2 var cache_frame_size = (screen_size * LOAD_SCREENS)
var images = ribbon.find('.image') var images = ribbon.find('.image')
var first = getImageGID(images.first()) var first = getImageGID(images.first())
var last = getImageGID(images.last()) var last = getImageGID(images.last())
var gids = getGIDsAfter(-cache_frame_size, first) var gids = getGIDsAfter(-cache_frame_size, first, i)
.concat(getGIDsAfter(cache_frame_size, last)) .concat(getGIDsAfter(cache_frame_size, last, i))
var cache = [] var cache = []
IMAGE_CACHE[i] = cache IMAGE_CACHE[i] = cache

2
ui/setup.js
View File

@ -317,12 +317,14 @@ function setupDataBindings(viewer){
// caching... // caching...
/* XXX this appears to actually make things slower...
.on('reloadedRibbon updatedRibbon', function(evt, ribbon){ .on('reloadedRibbon updatedRibbon', function(evt, ribbon){
window.DEBUG && console.log('>>> (ribbon:', getRibbonIndex(ribbon), ') Updating cache...') window.DEBUG && console.log('>>> (ribbon:', getRibbonIndex(ribbon), ') Updating cache...')
preCacheRibbonImages(ribbon) preCacheRibbonImages(ribbon)
}) })
*/
// info... // info...
.on('focusingImage', .on('focusingImage',