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

added progress fail state...

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

14
ui/files.js
View File

@ -147,11 +147,15 @@ function statusProgress(msg, tracker, close_button){
var total = 0 var total = 0
var done = 0 var done = 0
// XXX do we need a fail handler here???
return tracker return tracker
.done(function(){ .done(function(){
// XXX for some reason this does not allways display "done" // XXX for some reason this does not allways display "done"
closeProgressBar(progress) closeProgressBar(progress)
}) })
.fail(function(){
closeProgressBar(progress, 'error')
})
.progress(function(){ .progress(function(){
var args = $.makeArray(arguments) var args = $.makeArray(arguments)
var getter = args[args.length-1] var getter = args[args.length-1]
@ -830,9 +834,13 @@ function loadDir(path, no_preview_processing, prefix, tracker){
if(tracker == null){ if(tracker == null){
var tracker = statusProgress('Loading') var tracker = statusProgress('Loading')
// XXX is this the right way to go??? // XXX is this the right way to go???
res.done(function(){ res
tracker.resolve() .done(function(){
}) tracker.resolve()
})
.fail(function(){
tracker.reject()
})
} }
if(tracker == false){ if(tracker == false){
tracker == null tracker == null

20
ui/ui.js
View File

@ -496,7 +496,7 @@ function getProgressContainer(mode, parent){
// By default triggers the progressDone event. // By default triggers the progressDone event.
// //
// Shorthand: // Shorthand:
// closeProgressBar(name) // closeProgressBar(name[, msg])
// //
// - progressDone // - progressDone
// Triggered by user or progressClose handler. // Triggered by user or progressClose handler.
@ -561,10 +561,11 @@ function progressBar(name, container, close, hide_timeout, auto_remove){
}) })
state.text(' ('+done+' of '+total+')') state.text(' ('+done+' of '+total+')')
}) })
.on('progressDone', function(evt, done){ .on('progressDone', function(evt, done, msg){
done = done == null ? bar.attr('value') : done done = done == null ? bar.attr('value') : done
msg = msg == null ? 'done' : msg
bar.attr('value', done) bar.attr('value', done)
state.text(' (done)') state.text(' ('+msg+')')
widget.find('.close').hide() widget.find('.close').hide()
setTimeout(function(){ setTimeout(function(){
@ -590,8 +591,12 @@ function progressBar(name, container, close, hide_timeout, auto_remove){
}) })
if(close === false){ if(close === false){
widget.on('progressClose', function(){ widget.on('progressClose', function(evt, msg){
widget.trigger('progressDone') if(msg != null){
widget.trigger('progressDone', [null, msg])
} else {
widget.trigger('progressDone')
}
}) })
} else if(close != null){ } else if(close != null){
widget.on('progressClose', close) widget.on('progressClose', close)
@ -627,7 +632,10 @@ function resetProgressBar(name){
function updateProgressBar(name, done, total){ function updateProgressBar(name, done, total){
return triggerProgressBarEvent(name, 'progressUpdate', [done, total]) return triggerProgressBarEvent(name, 'progressUpdate', [done, total])
} }
function closeProgressBar(name){ function closeProgressBar(name, msg){
if(msg != null){
return triggerProgressBarEvent(name, 'progressClose', [msg])
}
return triggerProgressBarEvent(name, 'progressClose') return triggerProgressBarEvent(name, 'progressClose')
} }