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

more tweeking...

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

20
ui/ImageGrid.js
View File

@ -390,7 +390,7 @@ function centerImage(image, mode){
// XXX might be good to merge this and centerImage... // XXX might be good to merge this and centerImage...
// ...or make a generic centering function... // ...or make a generic centering function...
// //
// XXX this produces errors in marked-only mode... // XXX this does not work in marked-only mode...
function centerRibbon(ribbon, image, mode){ function centerRibbon(ribbon, image, mode){
if(mode == null){ if(mode == null){
//mode = 'css' //mode = 'css'
@ -407,7 +407,7 @@ function centerRibbon(ribbon, image, mode){
} }
var scale = getElementScale($('.ribbon-set')) var scale = getElementScale($('.ribbon-set'))
var target = getImageBefore(null, ribbon, null) var target = getImageBefore(image, ribbon, null)
if(target.length > 0){ if(target.length > 0){
var dl = getRelativeVisualPosition(target, image).left/scale var dl = getRelativeVisualPosition(target, image).left/scale
@ -569,10 +569,13 @@ function lastImage(mode){
function prevRibbon(moving, mode){ function prevRibbon(moving, mode){
mode = mode == null ? NAV_DEFAULT : mode mode = mode == null ? NAV_DEFAULT : mode
var cur = $('.current.image') var cur = $('.current.image')
var target = getImageBefore(cur, cur.closest('.ribbon').prevAll('.ribbon:visible').first()) var target = getImageBefore(cur,
cur.closest('.ribbon').prevAll('.ribbon:visible').first())
if(target.length == 0){ if(target.length == 0){
// XXX too complex??? // XXX too complex???
target = cur.closest('.ribbon').prevAll('.ribbon:visible').first().find('.image' + mode).first() target = cur.closest('.ribbon')
.prevAll('.ribbon:visible').first()
.find('.image' + mode).first()
} }
if(moving == 'next' && cur.attr('order') != target.attr('order')){ if(moving == 'next' && cur.attr('order') != target.attr('order')){
var next = target.nextAll('.image' + mode).first() var next = target.nextAll('.image' + mode).first()
@ -584,10 +587,13 @@ function prevRibbon(moving, mode){
function nextRibbon(moving, mode){ function nextRibbon(moving, mode){
mode = mode == null ? NAV_DEFAULT : mode mode = mode == null ? NAV_DEFAULT : mode
var cur = $('.current.image') var cur = $('.current.image')
var target = getImageBefore(cur, cur.closest('.ribbon').nextAll('.ribbon:visible').first()) var target = getImageBefore(cur,
cur.closest('.ribbon').nextAll('.ribbon:visible').first())
if(target.length == 0){ if(target.length == 0){
// XXX too complex??? // XXX too complex???
target = cur.closest('.ribbon').nextAll('.ribbon:visible').first().find('.image' + mode).first() target = cur.closest('.ribbon')
.nextAll('.ribbon:visible').first()
.find('.image' + mode).first()
} }
if(moving == 'next' && cur.attr('order') != target.attr('order')){ if(moving == 'next' && cur.attr('order') != target.attr('order')){
var next = target.nextAll('.image' + mode).first() var next = target.nextAll('.image' + mode).first()
@ -731,6 +737,8 @@ function clickHandler(evt){
var img = $(evt.target).closest('.image') var img = $(evt.target).closest('.image')
centerImage(focusImage(img)) centerImage(focusImage(img))
centerRibbons()
} }