From a02b8351271f632afcee08068dfeb3485ff378c9 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 13 May 2013 02:45:36 +0400 Subject: [PATCH] more refactoring... Signed-off-by: Alex A. Naanou --- ui/ImageGrid.data.js | 2 +- ui/ImageGrid.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/ImageGrid.data.js b/ui/ImageGrid.data.js index da765b82..0a379c5d 100755 --- a/ui/ImageGrid.data.js +++ b/ui/ImageGrid.data.js @@ -428,7 +428,7 @@ function setupDataBindings(){ } }) /* - // XXX BUGGY... + // XXX BUGGY -- pissibly due to rollRibbon align issues... .on('centeringRibbon', function(evt, ribbon, image){ // check if we are in the right range... var gid = getImageGID(image) diff --git a/ui/ImageGrid.js b/ui/ImageGrid.js index 513f0623..9ec112cf 100755 --- a/ui/ImageGrid.js +++ b/ui/ImageGrid.js @@ -131,12 +131,11 @@ function getImageBefore(image, ribbon, mode){ ribbon = getRibbon(image) } var images = $(ribbon).find('.image').filter(mode) - // XXX need to process/format this correctly... - var order = JSON.parse(image.attr('order')) + var order = getImageOrder(image) var prev = [] images.each(function(){ - if(order < JSON.parse($(this).attr('order'))){ + if(order < getImageOrder($(this))){ return false } prev = this @@ -295,6 +294,9 @@ function removeRibbon(ribbon){ // NOTE: negative left or right will contract the ribbon... // XXX check what goes on if left/right are far more than length... +// XXX compensating for added/removed images at the start of the ribbon +// does not work the same in every situation... +// ...for some reason it is correct ONLY for left == -right function extendRibbon(left, right, ribbon){ ribbon = ribbon == null ? getRibbon()