From 0b9dbeb3439e634ea0f626eb18122e2cf8c163c3 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 13 May 2013 17:59:19 +0400 Subject: [PATCH] extendRibbon now done (correctly accounts for left add/remove), loadImages still broken... Signed-off-by: Alex A. Naanou --- ui/ImageGrid.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/ui/ImageGrid.js b/ui/ImageGrid.js index d260b0ff..44c74fee 100755 --- a/ui/ImageGrid.js +++ b/ui/ImageGrid.js @@ -330,16 +330,25 @@ function extendRibbon(left, right, ribbon){ // normalize position... // NOTE: this is fool-proof as it's based on relative visual // position... + var position_updated = false var post = getRelativeVisualPosition($('.viewer'), ribbon).left + var scale = getElementScale($('.ribbon-set')) + var l = parseFloat(ribbon.css('left')) + l = isNaN(l) ? 0 : l if(pre != post){ - var scale = getElementScale($('.ribbon-set')) - var l = parseFloat(ribbon.css('left')) - l = isNaN(l) ? 0 : l + position_updated = true + l = l + (pre - post)/scale + } + if(left != 0){ + position_updated = true + l -= left * images.outerWidth() + } + if(position_updated){ + // XXX do not do this unless l is changed... ribbon.css({ - left: l + (pre - post)/scale, + left: l, }) } - // compensate for the truncation... return res }