diff --git a/Viewer/features/filesystem.js b/Viewer/features/filesystem.js index cdeb4bcf..f9bfe0ad 100755 --- a/Viewer/features/filesystem.js +++ b/Viewer/features/filesystem.js @@ -2406,7 +2406,6 @@ var FileSystemWriterActions = actions.Actions({ size = size || settings['preview-size'] || 1000 - // XXX needs testing... var resize = this.makeResizedImage && settings['export-mode'] != 'copy best match' pattern = pattern @@ -2472,8 +2471,9 @@ var FileSystemWriterActions = actions.Actions({ && outputFile(to, img.text || '') // normal images (resize)... - } else if(that.makeResizedImage){ - // XXX can we make this batch... + } else if(resize){ + // XXX should this be sync??? + // XXX BUG: this creates unneeded backups... return that.makeResizedImage(gid, size, img_dir, { name, logger }) // normal images (copy)... diff --git a/Viewer/package-lock.json b/Viewer/package-lock.json index 1f3f433a..21fffc86 100755 --- a/Viewer/package-lock.json +++ b/Viewer/package-lock.json @@ -1211,11 +1211,11 @@ "integrity": "sha512-qxAWSFdwE0PeBh5Ws+pyX3SxJrwqratEIDrSg5odcHdUVFTzATMJImH2L8bMaDhxaQJj5ogoZc+lx56UIpXJ1g==" }, "ig-types": { - "version": "6.0.7", - "resolved": "https://registry.npmjs.org/ig-types/-/ig-types-6.0.7.tgz", - "integrity": "sha512-9pm+Hdq71v58B6NhLwsMqzHOpL5duAEHCX2UtGYG5iwGKZBxAr2DEl/tOn6Ui5xxq9mq1X6lW7PzXLrjXvuEgQ==", + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/ig-types/-/ig-types-6.0.8.tgz", + "integrity": "sha512-2Fd69Z/lOOTsU+algm+7BL//yDHbUYyorots9OvrF8fmDhk78T4QMZjPd7208xMG6NnuQRhmc3LbSA0yetf9pw==", "requires": { - "ig-object": "^5.4.12", + "ig-object": "^5.4.16", "object-run": "^1.0.1" } }, diff --git a/Viewer/package.json b/Viewer/package.json index 4dc3d37f..371f3a65 100755 --- a/Viewer/package.json +++ b/Viewer/package.json @@ -34,7 +34,7 @@ "ig-argv": "^2.16.3", "ig-features": "^3.4.7", "ig-object": "^5.4.16", - "ig-types": "^6.0.7", + "ig-types": "^6.0.8", "json5": "^2.1.3", "object-run": "^1.0.1", "requirejs": "^2.3.6",