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

fixes and code cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2012-08-04 18:57:54 +04:00
parent 0268831a7b
commit 99719c4c99
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ui/gallery-prototype.js
View File

@ -93,7 +93,7 @@ function setCurrentImage(){
// center other ribbons relative to current image... // center other ribbons relative to current image...
// XXX only two ribbons are positioned at this point... // XXX only two ribbons are positioned at this point...
function alignRibbons(){ function alignRibbons(){
// XXX might be goot to move this to a more generic location... // XXX might be good to move this to a more generic location...
var id = $('.current.image').attr('id') var id = $('.current.image').attr('id')
var directions = ['prev', 'next'] var directions = ['prev', 'next']
for(var i in directions){ for(var i in directions){
@ -316,9 +316,9 @@ function lastImage(){
$('.current.ribbon').children('.image').last().click() $('.current.ribbon').children('.image').last().click()
} }
// XXX add skip N images back and forth handlers...
// XXX for the above two functions to be stable we will need to jump up
// to the next and down to the prev element...
function focusRibbon(direction){ function focusRibbon(direction){
var id = $('.current.image').attr('id') var id = $('.current.image').attr('id')
var prev = getImageBefore(id, $('.current.ribbon')[direction]('.ribbon')) var prev = getImageBefore(id, $('.current.ribbon')[direction]('.ribbon'))
@ -355,7 +355,6 @@ function focusBelowRibbon(){
// - null - empty ribbon or no element greater id should be first // - null - empty ribbon or no element greater id should be first
// - element // - element
// XXX do we need to make ids numbers for this to work? // XXX do we need to make ids numbers for this to work?
// XXX might be better to make this binary search in very large sets of data
function getImageBefore_lin(id, ribbon){ function getImageBefore_lin(id, ribbon){
// walk the ribbon till we find two images one with an ID less and // walk the ribbon till we find two images one with an ID less and
// another greater that id... // another greater that id...
@ -372,7 +371,7 @@ function getImageBefore_lin(id, ribbon){
} }
// binery search for element just before the id... // generic binery search for element just before the id...
function binarySearch(id, lst, get){ function binarySearch(id, lst, get){
if(get == null){ if(get == null){
get = function(o){return o} get = function(o){return o}
@ -470,19 +469,24 @@ function createRibbon(direction){
return false return false
} }
// XXX need to account for increased top when creating a ribbon above...
// i.e. shift the content upward...
if(direction == 'prev'){
$('.field').css({
'margin-top': parseInt($('.field').css('margin-top')) - $('.current.ribbon').outerHeight()
})
}
var res = $('<div class="new-ribbon"></div>')[insert]('.current.ribbon') var res = $('<div class="new-ribbon"></div>')[insert]('.current.ribbon')
// HACK: without this, the class change below will not animate... // HACK: without this, the class change below will not animate...
.show() .show()
.addClass('ribbon') .addClass('ribbon')
.removeClass('new-ribbon') .removeClass('new-ribbon')
// XXX need to account for increased top when creating a ribbon above...
// i.e. shift the content upward... // XXX adding a new ribbon above the current effectively pushes the
/* // whole view down...
if(direction == 'prev'){ // ...need to compensate for this!!!
$('.field').css({
top: $('.field').position().top - $('.current.ribbon').outerHeight()
})
}*/
return res return res
} }
@ -541,7 +545,7 @@ function shiftImage(direction){
} }
} }
// XXX this has to know aout animations... // XXX this has to know about animations...
$('.current.image').click() $('.current.image').click()
} }

4
ui/gallery.html
View File

@ -133,8 +133,8 @@ $(document).ready(setup);
<br><br> <br><br>
<button onclick="createRibbonAbove()" disabled>create ribbon above (helper)</button><br> <button onclick="createRibbon('prev')">create ribbon above (helper)</button><br>
<button onclick="createRibbonBelow()" disabled>create ribbon below (helper)</button> <button onclick="createRibbonBelow('next')">create ribbon below (helper)</button>
<br><br> <br><br>