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

tweaks and npm update...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2020-11-20 04:21:11 +03:00
parent 0eb201fb06
commit d7b77a0492
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Viewer/features/sharp.js
View File

@ -603,12 +603,12 @@ var SharpActions = actions.Actions({
// XXX this seems to be called prematurely...
abort.cleanup(function(reason, res){
console.log('!!!!!!',
console.log('### ABORT:\n ',
logger && logger.log.length,
reason, res)
/*
logger
&& logger.emit('done')
&& logger.emit('close')
&& reason == 'aborted'
&& logger.emit(res)
//*/

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

@ -128,6 +128,7 @@ var ProgressActions = actions.Actions({
.append($('<span class="close">&times;</span>')
.on('click', function(){
var cache = (that.__progress_cache || {})[text]
// XXX do we need both close and done callbacks???
cache.onclose
&& cache.onclose()
widget.trigger('progressClose') }))
@ -143,6 +144,7 @@ var ProgressActions = actions.Actions({
var cache = (that.__progress_cache || {})[text]
cache.timeout
&& clearTimeout(cache.timeout)
// XXX do we need both close and done callbacks???
cache.ondone
&& cache.ondone()
delete (that.__progress_cache || {})[text]
@ -175,6 +177,7 @@ var ProgressActions = actions.Actions({
// auto-close...
if(value && value >= (max || 0)){
widget.attr('close-timeout',
// XXX BUG: this appears to get triggered after we close progress...
JSON.stringify(setTimeout(function(){
widget.trigger('progressClose')
}, this.config['progress-done-delay'] || 1000))) }
@ -209,10 +212,13 @@ var ProgressActions = actions.Actions({
'skipped',
'removed',
]
var close = [
'close',
'end',
]
// close...
// XXX is the right keyword...
if(status == 'done' && rest.length == 0){
if(close.includes(status)){
this.showProgress(path, 'close', logger)
// report progress...

14
Viewer/package-lock.json generated
View File

@ -1112,16 +1112,16 @@
}
},
"ig-object": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/ig-object/-/ig-object-5.3.0.tgz",
"integrity": "sha512-8I3w0Gqv96cx1Eirqrvtuh4Pq8X4U3tAexj4nMwceNu4jzZF1wg9FP3Im5ZZ99kQSk7CWl4tjSGe/aS5IXEoMw=="
"version": "5.4.9",
"resolved": "https://registry.npmjs.org/ig-object/-/ig-object-5.4.9.tgz",
"integrity": "sha512-dmwTla11Kme9pSq7hUjHVNNnbJGg1fQZCm3bquuuTIj5KlI1OLgka14fAhjWOf3kGtHJ2x5Nznvd7yxka26OzQ=="
},
"ig-types": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/ig-types/-/ig-types-3.6.0.tgz",
"integrity": "sha512-zLy40mWfYXPeCw82zoAapgUUvpGvF0GNSZTAEX1s/qpAP2YYR9SnvP8QEJ1N/LqyNSpSC3q+axsBVYEqIgW2fg==",
"version": "3.7.12",
"resolved": "https://registry.npmjs.org/ig-types/-/ig-types-3.7.12.tgz",
"integrity": "sha512-Qp5N79XLq+BvLyxJAn/JNVwt+IWmedQdHBUCImeZ57MJiX6e2I/EZ79D16xU4r866RAEwFFBSsm7q9RWoVNuBg==",
"requires": {
"ig-object": "^5.3.0",
"ig-object": "^5.4.2",
"object-run": "^1.0.1"
}
},

4
Viewer/package.json
View File

@ -31,8 +31,8 @@
"ig-actions": "^3.24.11",
"ig-argv": "^2.15.0",
"ig-features": "^3.4.2",
"ig-object": "^5.3.0",
"ig-types": "^3.6.0",
"ig-object": "^5.4.9",
"ig-types": "^3.7.12",
"moment": "^2.29.1",
"object-run": "^1.0.1",
"requirejs": "^2.3.6",