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

Merge branch 'master' of github.com:flynx/ImageGrid

Browse Source
This commit is contained in:
Alex A. Naanou 2020-11-27 19:25:00 +03:00
commit 026ff53ab2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Viewer/imagegrid/data.js
View File

@ -240,7 +240,6 @@ var DataPrototype = {
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 },
get order_index(){ get order_index(){
@ -870,7 +869,7 @@ var DataPrototype = {
: target : target
// explicit image gid -- get the loaded group gid... // explicit image gid -- get the loaded group gid...
if(this.order.includes(target)){ if(target in this.order_index){
var x = this.getLoadedInGroup(target) var x = this.getLoadedInGroup(target)
target = x != null ? target = x != null ?
x x
@ -967,7 +966,7 @@ var DataPrototype = {
i = target i = target
} else { } else {
i = this.order.indexOf(target) i = this.order_index[target]
// invalid gid... // invalid gid...
// XXX need a better way to report errors... // XXX need a better way to report errors...
@ -1386,7 +1385,7 @@ var DataPrototype = {
var x = this.getLoadedInGroup(target) var x = this.getLoadedInGroup(target)
target = x != null ? x : target target = x != null ? x : target
var i = this.order.indexOf(target) var i = this.order_index[target]
if(i == -1){ if(i == -1){
return null return null
} }
@ -1428,7 +1427,7 @@ var DataPrototype = {
if(target && current == null && mode == null && list == null){ if(target && current == null && mode == null && list == null){
current = this.getImage(target, 'after') current = this.getImage(target, 'after')
} }
if(this.order.indexOf(current) >= 0){ if(this.order_index[current] >= 0){
this.__current = current this.__current = current
} }
return this }, return this },