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

several minor bugs squashed...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-02-22 07:59:07 +04:00
parent 4b4aed8709
commit 98ebfa64c2
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/files.js
View File

@ -780,7 +780,8 @@ function loadRawDir(path, no_preview_processing, prefix){
var _run = function(func){ var _run = function(func){
var res = $.Deferred() var res = $.Deferred()
func() func()
.done(function(){ //.done(function(){
.depleted(function(){
res.resolve() res.resolve()
}) })
return res return res
@ -1036,8 +1037,7 @@ function exportImagesTo(path, im_name, dir_name, size){
showStatusQ('Export: done.') showStatusQ('Export: done.')
res.resolve() res.resolve()
}) })
.filling()
pool.filling()
// go through ribbons... // go through ribbons...
for(var i=DATA.ribbons.length-1; i >= 0; i--){ for(var i=DATA.ribbons.length-1; i >= 0; i--){
@ -1062,7 +1062,6 @@ function exportImagesTo(path, im_name, dir_name, size){
} }
pool.doneFilling() pool.doneFilling()
return res return res
} }
@ -1121,6 +1120,7 @@ function readImagesOrientationQ(gids, no_update_loaded){
gids = gids == null ? getClosestGIDs() : gids gids = gids == null ? getClosestGIDs() : gids
var queue = getWorkerQueue('Read images orientation', 4) var queue = getWorkerQueue('Read images orientation', 4)
.filling()
var last = null var last = null
@ -1129,6 +1129,7 @@ function readImagesOrientationQ(gids, no_update_loaded){
last = queue.enqueue(readImageOrientation, gid, no_update_loaded) last = queue.enqueue(readImageOrientation, gid, no_update_loaded)
}) })
queue.doneFilling()
return queue return queue
} }
@ -1153,11 +1154,13 @@ function readImagesDatesQ(images){
images = images == null ? IMAGES : images images = images == null ? IMAGES : images
var queue = getWorkerQueue('Read images dates', 4) var queue = getWorkerQueue('Read images dates', 4)
.filling()
$.each(images, function(gid, img){ $.each(images, function(gid, img){
queue.enqueue(readImageDate, gid, images) queue.enqueue(readImageDate, gid, images)
}) })
queue.doneFilling()
return queue return queue
} }
@ -1226,11 +1229,13 @@ function updateImagesGIDsQ(images, data){
images = images == null ? IMAGES : images images = images == null ? IMAGES : images
var queue = getWorkerQueue('Update GIDs', 4) var queue = getWorkerQueue('Update GIDs', 4)
.filling()
$.each(images, function(key){ $.each(images, function(key){
queue.enqueue(updateImageGID, key, images, data) queue.enqueue(updateImageGID, key, images, data)
}) })
queue.doneFilling()
IMAGES_CREATED = true IMAGES_CREATED = true
return queue return queue

7
ui/lib/jli.js
View File

@ -1025,6 +1025,13 @@ function makeDeferredPool(size, paused){
return this.on('deplete', func) return this.on('deplete', func)
} }
// Deferred compatibility...
//
// NOTE: the key difference between this and the deferred is that this
// does not have memory and can get called multiple times...
// XXX is this correct???
//Pool.done = Pool.depleted
// Register queue progress handler... // Register queue progress handler...
// //
// This occurs after each worker is done. // This occurs after each worker is done.