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

reworked closing of a shared progress bar...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2020-12-04 06:48:59 +03:00
parent f9930bf6b9
commit 1f941854d6
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Viewer/features/core.js
View File

@ -2871,8 +2871,8 @@ var TaskActions = actions.Actions({
.on('taskFailed', function(evt, t, err){
this.logger && this.logger.emit('skipped', t, err) })
.on('stop', function(){
// XXX not sure about this...
this.logger && this.logger.emit('skipped', [...this])
//this.logger && this.logger.emit('skipped', [...this])
this.logger && this.logger.emit('reset')
this.clear() })
// cleanup...
queue

13
Viewer/features/ui-progress.js
View File

@ -75,6 +75,9 @@ var ProgressActions = actions.Actions({
'skipping',
'removed',
],
reset: [
'clear',
],
close: [
'end',
'abort',
@ -107,7 +110,7 @@ var ProgressActions = actions.Actions({
Close progress bar...
.showProgress('text', 'close')
Relative progress modification...
.showProgress('text', '+1')
.showProgress('text', '+0', '+1')
@ -238,7 +241,7 @@ var ProgressActions = actions.Actions({
.text(msg)
// auto-close...
if(value && value >= (max || 0)){
if(value != null && value >= (max || 0)){
widget.attr('close-timeout',
JSON.stringify(setTimeout(
function(){
@ -263,19 +266,23 @@ var ProgressActions = actions.Actions({
&& (attrs.onclose = logger.onclose)
// get keywords...
var {add, done, skip, close, error} =
var {add, done, skip, reset, close, error} =
this.config['progress-logger-keywords']
|| {}
// setup default aliases...
add = new Set([...(add || []), 'added'])
done = new Set([...(done || [])])
skip = new Set([...(skip || []), 'skipped'])
reset = new Set([...(reset || [])])
close = new Set([...(close || []), 'closed'])
error = new Set([...(error || [])])
// close...
if(status == 'close' || close.has(status)){
this.showProgress(path, 'close', attrs)
// reset...
} else if(status == 'reset' || reset.has(status)){
this.showProgress(path, 0, 0, attrs)
// added new item -- increase max...
// XXX show msg in the progress bar???
} else if(status == 'add' || add.has(status)){

6
Viewer/package-lock.json generated
View File

@ -1110,9 +1110,9 @@
"integrity": "sha512-9kZM80Js9/eTwXN9VXwLDC1wDJ7gIAdYU9GIzb5KJmNcLAMaW+zhgFrwFFMrcSfggUuadgnqSrS41E4XLe8JZw=="
},
"ig-types": {
"version": "5.0.38",
"resolved": "https://registry.npmjs.org/ig-types/-/ig-types-5.0.38.tgz",
"integrity": "sha512-eiDnadPddsSlq68wulCGMl00nL8MLrwFrBhw2peioXWwvJHkS1tA4qUiYaNYZDK3tEFo1B3idx3nBQ8jiATWAA==",
"version": "5.0.39",
"resolved": "https://registry.npmjs.org/ig-types/-/ig-types-5.0.39.tgz",
"integrity": "sha512-Tqha0RCPFm2rlcmsBSb9RyhUBK4qNAhtCIqmWeq/k0StiotC9EddqlFOXuJvKtFBSKFYorRYAv+rewXP3Y3YYQ==",
"requires": {
"ig-object": "^5.4.12",
"object-run": "^1.0.1"

2
Viewer/package.json
View File

@ -32,7 +32,7 @@
"ig-argv": "^2.15.0",
"ig-features": "^3.4.2",
"ig-object": "^5.4.12",
"ig-types": "^5.0.38",
"ig-types": "^5.0.39",
"moment": "^2.29.1",
"object-run": "^1.0.1",
"requirejs": "^2.3.6",