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

working on a bug related to .order_index...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-12-23 14:58:00 +03:00
parent d701cdb85b
commit 85a4f3df0a
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ui (gen4)/imagegrid/data.js
View File

@ -134,6 +134,13 @@ if(typeof(sha1) != 'undefined'){
/*********************************************************************/ /*********************************************************************/
// Data... // Data...
var OrderProxy = {
set: function(target, property, value, receiver){
target[property] = value
return true
}
}
var DataClassPrototype = { var DataClassPrototype = {
// NOTE: we consider the input list sorted... // NOTE: we consider the input list sorted...
fromArray: function(list){ fromArray: function(list){
@ -241,11 +248,32 @@ var DataPrototype = {
this.getRibbon(value) this.getRibbon(value)
: value }, : value },
// XXX need to figure out how to both reset the .order_index in a safe
// way and keep it to speed things up in consecutive calls that
// do not touch the order...
get order(){ get order(){
return this.__order }, return this.__order },
set order(value){ set order(value){
var that = this
delete this.__order_index delete this.__order_index
//*
this.__order = value this.__order = value
/*/
// XXX this makes things substantially slower...
this.__order = value.isOrderProxy ?
value
: new Proxy(value, {
get: function(target, name){
return name == 'isOrderProxy'
|| target[name] },
set: function(target, name, value){
that.order_index[value] = name
target[name] = value
return true
},
})
//*/
}, },
get order_index(){ get order_index(){
return this.__order_index = this.__order_index || this.order.toKeys() }, return this.__order_index = this.__order_index || this.order.toKeys() },
@ -351,8 +379,9 @@ var DataPrototype = {
: gids : gids
target = target == null ? [] : target target = target == null ? [] : target
order = this.order var order = this.order
//var order_idx = order.toKeys() //var order_idx = order.toKeys()
// XXX to cache order index we need to update it every time we change order...
var order_idx = this.order_index || order.toKeys() var order_idx = this.order_index || order.toKeys()
var rest = [] var rest = []
@ -1701,7 +1730,6 @@ var DataPrototype = {
lst.length = l lst.length = l
lst.reverse() lst.reverse()
}) })
return this return this
}, },
@ -1807,6 +1835,7 @@ var DataPrototype = {
// horizontal shift -- gather the images horizontally... // horizontal shift -- gather the images horizontally...
if(reference != 'keep'){ if(reference != 'keep'){
var ref = this.getImage(reference) var ref = this.getImage(reference)
var order = this.order
// NOTE: the reference index will not move as nothing will // NOTE: the reference index will not move as nothing will
// ever change it's position relative to it... // ever change it's position relative to it...
@ -2408,6 +2437,7 @@ var DataPrototype = {
n[set][key] = lst.splice(0, i) n[set][key] = lst.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]
n.order_index = n.order.toKeys()
res.push(n) res.push(n)
}) })
@ -2470,6 +2500,7 @@ var DataPrototype = {
// merge order... // merge order...
// XXX need to take care of gid conflicts... (???) // XXX need to take care of gid conflicts... (???)
base.order = base.order.concat(data.order) base.order = base.order.concat(data.order)
base.order_index = base.order.toKeys()
// merge .ribbons and .ribbon_order... // merge .ribbons and .ribbon_order...
// NOTE: this is a special case, so we do not handle it in // NOTE: this is a special case, so we do not handle it in