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

minor bugfix -- now ribbon gids can be used in url-hash and in .current or .focusImage(..)

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2017-06-15 06:29:22 +03:00
parent 90276c7529
commit 6bf5296918
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,7 +207,7 @@ var DataPrototype = {
|| this.getImages(this.ribbon_order[0])[0] || this.getImages(this.ribbon_order[0])[0]
|| this.order[0] }, || this.order[0] },
set current(value){ set current(value){
this.__current = value }, this.focusImage(value) },
get base(){ get base(){
return this.__base || this.ribbon_order.slice(-1)[0] }, return this.__base || this.ribbon_order.slice(-1)[0] },
@ -1135,8 +1135,12 @@ var DataPrototype = {
// info... // info...
focusImage: function(target, mode, list){ focusImage: function(target, mode, list){
var current = this.getImage(target, mode, list) var current = this.getImage(target, mode, list)
// in case no args are given other than target...
if(target && current == null && mode == null && list == null){
current = this.getImage(target, 'after')
}
if(this.order.indexOf(current) >= 0){ if(this.order.indexOf(current) >= 0){
this.current = current this.__current = current
} }
return this return this
}, },
@ -2561,7 +2565,6 @@ var DataPrototype = {
data = typeof(data) == typeof('str') ? JSON.parse(data) : data data = typeof(data) == typeof('str') ? JSON.parse(data) : data
data = formats.updateData(data) data = formats.updateData(data)
this.base = data.base this.base = data.base
this.current = data.current
this.order = data.order.slice() this.order = data.order.slice()
this.ribbon_order = data.ribbon_order.slice() this.ribbon_order = data.ribbon_order.slice()
@ -2578,6 +2581,8 @@ var DataPrototype = {
} }
}) })
this.current = data.current
// extra data... // extra data...
!clean !clean
&& Object.keys(data).forEach(function(k){ && Object.keys(data).forEach(function(k){