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

bugfix in tags...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-02-13 18:59:44 +04:00
parent 92b928fbfb
commit ef10c17fc3
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/tags.js
View File

@ -202,7 +202,7 @@ function updateTags(tags, gid, tagset, images){
function tagSelectAND(tags, from, no_sort, tagset){ function tagSelectAND(tags, from, no_sort, tagset){
tags = typeof(tags) == typeof('str') ? [ tags ] : tags tags = typeof(tags) == typeof('str') ? [ tags ] : tags
tagset = tagset == null ? TAGS : tagset tagset = tagset == null ? TAGS : tagset
from = from == null ? getLoadedGIDs() : from from = from == null ? getLoadedGIDs() : getLoadedGIDs(from)
// special case: a single tag... // special case: a single tag...
// NOTE: this is significantly faster. // NOTE: this is significantly faster.
@ -300,13 +300,17 @@ function tagSelectOR(tags, from, no_sort, tagset){
*/ */
function tagList(list, tags){ function tagList(list, tags){
list.forEach(function(gid){ list = getLoadedGIDs(list)
list
.forEach(function(gid){
addTag(tags, gid) addTag(tags, gid)
}) })
return list return list
} }
function untagList(list, tags){ function untagList(list, tags){
list.forEach(function(gid){ list = getLoadedGIDs(list)
list
.forEach(function(gid){
removeTag(tags, gid) removeTag(tags, gid)
}) })
return list return list

2
ui/ui.js
View File

@ -570,6 +570,8 @@ function progressBar(name, container, close, hide_timeout, auto_remove){
setTimeout(function(){ setTimeout(function(){
widget.hide() widget.hide()
// XXX this is not a good way to go...
// need a clean way to reset...
if(auto_remove){ if(auto_remove){
widget.remove() widget.remove()
} }