From be9bb9126bebd1957606b0ff281fb364b23aa64a Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Fri, 27 Nov 2020 06:30:28 +0300 Subject: [PATCH] minor bugfix... Signed-off-by: Alex A. Naanou --- Viewer/features/base.js | 13 ++----------- Viewer/features/filesystem.js | 7 ++----- Viewer/features/metadata.js | 3 +-- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/Viewer/features/base.js b/Viewer/features/base.js index 4d23112c..30ca7401 100755 --- a/Viewer/features/base.js +++ b/Viewer/features/base.js @@ -369,11 +369,7 @@ actions.Actions({ if(!k.startsWith('_') && this[k] != null && this[k].json != null){ - res[k] = this[k].json() - } - } - } - }], + res[k] = this[k].json() } } } }], getImagePath: ['- System/', function(gid, type){ @@ -1389,12 +1385,7 @@ module.CropActions = actions.Actions({ return c .json() .run(function(){ - delete this.tags }) - }) - } - } - } - }], + delete this.tags }) }) } } } }], // load the crop stack if present... load: [function(state){ return function(){ diff --git a/Viewer/features/filesystem.js b/Viewer/features/filesystem.js index 1f9784f9..9892ffa9 100755 --- a/Viewer/features/filesystem.js +++ b/Viewer/features/filesystem.js @@ -302,7 +302,6 @@ var FileSystemLoaderActions = actions.Actions({ var skipped = new Set() var paths = Object.keys(res) paths - .sort() .forEach(function(p){ // already removed... if(skipped.has(p) >= 0){ @@ -318,7 +317,7 @@ var FileSystemLoaderActions = actions.Actions({ skipped.add(e) delete res[e] }) }) // keep only the valid paths... - paths = Object.keys(res) + paths = Object.keys(res).sort() //console.log('SKIPPING NESTED:', skipped.length) @@ -407,9 +406,7 @@ var FileSystemLoaderActions = actions.Actions({ force_full_save // XXX remove as soon as merged index save is done... && loaded.length == 1 - && that.markChanged('all') }) - }) - }], + && that.markChanged('all') }) }) }], // Get image(s) previews... // diff --git a/Viewer/features/metadata.js b/Viewer/features/metadata.js index 85f0e199..40904c14 100755 --- a/Viewer/features/metadata.js +++ b/Viewer/features/metadata.js @@ -202,8 +202,7 @@ var MetadataReaderActions = actions.Actions({ this.images && this.images.forEach(function(gid){ - q.enqueue('metadata', read(gid)) - }) + q.enqueue('metadata', read(gid)) }) return q }],