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

some cleanup and minor changes...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-05-14 02:42:19 +04:00
parent 614f964152
commit 23f7936d9e
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ui/ImageGrid.data.js
View File

@ -410,11 +410,12 @@ function loadData(data, images_per_screen){
function setupDataBindings(viewer){ function setupDataBindings(viewer){
viewer = viewer == null ? $('.viewer') : viewer viewer = viewer == null ? $('.viewer') : viewer
viewer viewer
// XXX this always reloads everything...
// XXX this causes miss-aligns after shifting and/or zooming... // XXX this causes miss-aligns after shifting and/or zooming...
// ...after zooming, moving focus causes the screen to align // ...after zooming, moving focus causes the screen to align
// in an odd way until the next move corrects the issue... // in an odd way until the next move corrects the issue...
// XXX this still is odd when more than one ribbon is present... // XXX need to maintain the correct number of images per ribbon
// per zoom setting -- things get really odd when a ribbon
// is smaller than it should be...
.on('preCenteringRibbon', function(evt, ribbon, image){ .on('preCenteringRibbon', function(evt, ribbon, image){
// NOTE: we do not need to worry about centering the ribbon // NOTE: we do not need to worry about centering the ribbon
// here, just ball-park-load the correct batch... // here, just ball-park-load the correct batch...
@ -425,16 +426,21 @@ function setupDataBindings(viewer){
var img_before = getImageBefore(image, ribbon) var img_before = getImageBefore(image, ribbon)
var gid_before = getGIDBefore(gid, r) var gid_before = getGIDBefore(gid, r)
var screen_size = getScreenWidthInImages() var screen_size = getScreenWidthInImages()
var l = ribbon.find('.image').length
// load images if we do a long jump -- start, end or some mark // load images if we do a long jump -- start, end or some mark
// outside of currently loaded section... // outside of currently loaded section...
if(gid_before == null || gid_before != getImageGID(img_before)){ if(gid_before == null
|| gid_before != getImageGID(img_before)
// also load if we run out of images in the current ribbon,
// likely due to shifting...
|| ( gr.length > l
&& l < screen_size * LOAD_SCREENS)){
loadImages(gid, Math.round(screen_size * LOAD_SCREENS), ribbon) loadImages(gid, Math.round(screen_size * LOAD_SCREENS), ribbon)
// XXX compensate for the changing number of images... // XXX compensate for the changing number of images...
// roll the ribbon while we are advancing...
} }
// roll the ribbon while we are advancing...
var head = img_before.prevAll('.image') var head = img_before.prevAll('.image')
var tail = img_before.nextAll('.image') var tail = img_before.nextAll('.image')
@ -496,11 +502,25 @@ function setupDataBindings(viewer){
}) })
// XXX do we need to make this less global?
.on('fittingImages', function(evt, n){ .on('fittingImages', function(evt, n){
/*
// load correct amount of images in each ribbon!!!
// XXX this changes focus...
// XXX n == 1 breaks this -- going past first image...
var screen_size = getScreenWidthInImages()
var gid = getImageGID()
$('.ribbon').each(function(){
var r = $(this)
loadImages(gid, Math.round(screen_size * LOAD_SCREENS), r)
})
centerView(null, 'css')
*/
// update previews...
// XXX make this update only what needs updating...
updateImages() updateImages()
}) })
.on('focusingImage', function(evt, image){ .on('focusingImage', function(evt, image){
DATA.current = getImageGID($(image)) DATA.current = getImageGID($(image))
}) })