mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-29 10:20:08 +00:00
minor changes to scrollbars -- found bug I'm not sure how to fix, so here's a stub...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
c893085b60
commit
92b928fbfb
7
ui/ui.js
7
ui/ui.js
@ -511,7 +511,7 @@ function getProgressContainer(mode, parent){
|
|||||||
// Shorthand:
|
// Shorthand:
|
||||||
// resetProgressBar(name)
|
// resetProgressBar(name)
|
||||||
//
|
//
|
||||||
function progressBar(name, container, close, hide_timeout){
|
function progressBar(name, container, close, hide_timeout, auto_remove){
|
||||||
container = container == null
|
container = container == null
|
||||||
? getProgressContainer()
|
? getProgressContainer()
|
||||||
: container
|
: container
|
||||||
@ -523,6 +523,7 @@ function progressBar(name, container, close, hide_timeout){
|
|||||||
: hide_timeout < 0 ? 0
|
: hide_timeout < 0 ? 0
|
||||||
: hide_timeout > 3000 ? 3000
|
: hide_timeout > 3000 ? 3000
|
||||||
: hide_timeout
|
: hide_timeout
|
||||||
|
auto_remove = auto_remove == null ? true : auto_remove
|
||||||
|
|
||||||
var widget = getProgressBar(name)
|
var widget = getProgressBar(name)
|
||||||
|
|
||||||
@ -568,6 +569,10 @@ function progressBar(name, container, close, hide_timeout){
|
|||||||
|
|
||||||
setTimeout(function(){
|
setTimeout(function(){
|
||||||
widget.hide()
|
widget.hide()
|
||||||
|
|
||||||
|
if(auto_remove){
|
||||||
|
widget.remove()
|
||||||
|
}
|
||||||
}, hide_timeout)
|
}, hide_timeout)
|
||||||
})
|
})
|
||||||
.on('progressReset', function(){
|
.on('progressReset', function(){
|
||||||
|
|||||||
@ -34,7 +34,9 @@ function getWorkerProgressBar(name, worker, container){
|
|||||||
container,
|
container,
|
||||||
function(){
|
function(){
|
||||||
WORKERS[name].dropQueue()
|
WORKERS[name].dropQueue()
|
||||||
})
|
},
|
||||||
|
null,
|
||||||
|
true)
|
||||||
|
|
||||||
worker
|
worker
|
||||||
.progress(function(done, total){
|
.progress(function(done, total){
|
||||||
@ -57,7 +59,7 @@ function getWorkerProgressBar(name, worker, container){
|
|||||||
// get/create a named worker queue...
|
// get/create a named worker queue...
|
||||||
//
|
//
|
||||||
// XXX rename this to something task-related.... (???)
|
// XXX rename this to something task-related.... (???)
|
||||||
function getWorkerQueue(name, pool_size, container, no_auto_start, no_progress){
|
function getWorkerQueue(name, pool_size, container, no_auto_start, no_progress, auto_clear){
|
||||||
pool_size = pool_size == null ? 1 : pool_size
|
pool_size = pool_size == null ? 1 : pool_size
|
||||||
|
|
||||||
// create a new worker queue...
|
// create a new worker queue...
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user