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

minor tweaking, still needs testing...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-08-19 19:47:29 +04:00
parent 23e5a1ff77
commit 3b7387f750
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/data.js
View File

@ -738,36 +738,43 @@ function dataFromImages(images){
// 4 5 7 0 5 5 // 4 5 7 0 5 5
// (we add abs max shift |-5| to each element, to align top to 0) // (we add abs max shift |-5| to each element, to align top to 0)
// //
// XXX check version??? // XXX should we check the version???
// XXX needs testing...
function mergeData(a, b){ function mergeData(a, b){
var order = [] var order = []
var ribbon_sets = [] var ribbon_sets = []
var shifts = [] var shifts = []
var min = 0 var shift = 0
// build ribbon sets and shift bounds... // prepare the data...
// build the ribbon_set, shifts, accumulate order and set shift bounds...
$.each(arguments, function(_, d){ $.each(arguments, function(_, d){
if(typeof(d) == typeof([]) && d.constructor.name == 'Array'){ if(typeof(d) == typeof([]) && d.constructor.name == 'Array'){
// process the shift...
var s = d[0] var s = d[0]
d = d[1]
shifts.push(s) shifts.push(s)
// NOTE: min shift (max negative shift) is needed so as to // NOTE: min shift (max negative shift) is needed so as to
// calculate the actual padding per each aligned ribbon // calculate the actual padding per each aligned ribbon
// set in the resulting structure... // set in the resulting structure...
min = Math.min(s, min) shift = Math.min(s, shift)
// get the actual data...
d = d[1]
} else { } else {
// default shift...
shifts.push(0) shifts.push(0)
} }
ribbon_sets.push(d.ribbons) ribbon_sets.push(d.ribbons)
order = order.concat(d.order) order = order.concat(d.order)
}) })
var shift = Math.abs(min) shift = Math.abs(shift)
// normalize ribbons... // normalize ribbon_set...
// NOTE: this will shift the ribbons to the required alignment... // NOTE: this will shift the ribbons to the required alignment...
$.each(shifts, function(i, s){ $.each(shifts, function(i, s){
if(shift + s != 0){
ribbon_sets[i] = new Array(shift + s).concat(ribbon_sets[i]) ribbon_sets[i] = new Array(shift + s).concat(ribbon_sets[i])
}
}) })
return { return {