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

some cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-05-13 18:16:16 +04:00
parent 0b9dbeb343
commit beaf3d9fb7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/ImageGrid.js
View File

@ -293,8 +293,11 @@ function removeRibbon(ribbon){
*/ */
// NOTE: negative left or right will contract the ribbon... // NOTE: negative left or right will contract the ribbon...
// NOTE: this will compensate for left position changes so as the images
// that did not change will stay in the same position.
// to disable this, set no_compensate_shift to true.
// XXX check what goes on if left/right are far more than length... // XXX check what goes on if left/right are far more than length...
function extendRibbon(left, right, ribbon){ function extendRibbon(left, right, ribbon, no_compensate_shift){
ribbon = ribbon == null ? ribbon = ribbon == null ?
getRibbon() getRibbon()
: $(ribbon) : $(ribbon)
@ -327,7 +330,6 @@ function extendRibbon(left, right, ribbon){
res.right = createImages(right, removed).appendTo(ribbon) res.right = createImages(right, removed).appendTo(ribbon)
} }
// normalize position...
// NOTE: this is fool-proof as it's based on relative visual // NOTE: this is fool-proof as it's based on relative visual
// position... // position...
var position_updated = false var position_updated = false
@ -335,16 +337,19 @@ function extendRibbon(left, right, ribbon){
var scale = getElementScale($('.ribbon-set')) var scale = getElementScale($('.ribbon-set'))
var l = parseFloat(ribbon.css('left')) var l = parseFloat(ribbon.css('left'))
l = isNaN(l) ? 0 : l l = isNaN(l) ? 0 : l
// compensate for positioning errors...
// XXX not sure where these come from, when the scale is != 0...
if(pre != post){ if(pre != post){
position_updated = true position_updated = true
l = l + (pre - post)/scale l = l + (pre - post)/scale
} }
if(left != 0){ // compensate for left shift...
if(!no_compensate_shift && left != 0){
position_updated = true position_updated = true
l -= left * images.outerWidth() l -= left * images.outerWidth()
} }
// write the position...
if(position_updated){ if(position_updated){
// XXX do not do this unless l is changed...
ribbon.css({ ribbon.css({
left: l, left: l,
}) })