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

several fixes in split/join pair...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-03-22 04:34:09 +04:00
parent b12703cfba
commit 8bc83e0dcf
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/data4.js
View File

@ -761,7 +761,6 @@ var DataPrototype = {
// //
// NOTE: this might result in empty ribbons, if no images are in a // NOTE: this might result in empty ribbons, if no images are in a
// given ribbon in the section to be split... // given ribbon in the section to be split...
// XXX test
split: function(target){ split: function(target){
if(target.constructor.name != 'Array'){ if(target.constructor.name != 'Array'){
target = [target] target = [target]
@ -773,10 +772,10 @@ var DataPrototype = {
i = tail.getImageOrder(i)-1 i = tail.getImageOrder(i)-1
var n = new Data() var n = new Data()
n.base = tail.base n.base = tail.base
n.ribbon_order = base.ribbon_order.slice() n.ribbon_order = tail.ribbon_order.slice()
n.order = tail.order.splice(0, i) n.order = tail.order.splice(0, i)
for(var k in this.ribbons){ for(var k in tail.ribbons){
n.ribbons[k] = tail.ribbons.splice(0, i) n.ribbons[k] = tail.ribbons[k].splice(0, i)
} }
n.current = n.order.indexOf(tail.current) >= 0 ? tail.current : n.order[0] n.current = n.order.indexOf(tail.current) >= 0 ? tail.current : n.order[0]
@ -810,7 +809,8 @@ var DataPrototype = {
// NOTE: this will merge the items in-place, if it is needed to // NOTE: this will merge the items in-place, if it is needed to
// keep the original intact, just .clone() it... // keep the original intact, just .clone() it...
// //
// XXX test // XXX should we remove duplicate gids here???
// XXX test more complex cases...
join: function(){ join: function(){
var args = Array.apply(null, arguments) var args = Array.apply(null, arguments)
var align = typeof(args[0]) == typeof('str') ? args.splice(0, 1)[0] : 'base' var align = typeof(args[0]) == typeof('str') ? args.splice(0, 1)[0] : 'base'
@ -832,6 +832,9 @@ var DataPrototype = {
var t = 0 var t = 0
// merge order...
base.order = base.order.concat(data.order)
// merge ribbons... // merge ribbons...
for(var i=0; i < data.ribbon_order.length; i++){ for(var i=0; i < data.ribbon_order.length; i++){
var g = data.ribbon_order[i] var g = data.ribbon_order[i]
@ -851,7 +854,7 @@ var DataPrototype = {
// append ribbons... // append ribbons...
} else if(d < base.ribbon_order.length){ } else if(d < base.ribbon_order.length){
var tg = base.ribbon_order[d] var tg = base.ribbon_order[d]
base.ribbons[tg].concat(r) base.ribbons[tg] = base.ribbons[tg].concat(r)
// push the new ribbon to the end... // push the new ribbon to the end...
} else { } else {