From 2830e68d8e6f3eb74a6404663c6948652172c8bd Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Tue, 10 Nov 2020 18:00:14 +0300 Subject: [PATCH] minor tweak + npm update... Signed-off-by: Alex A. Naanou --- Viewer/features/sharp.js | 13 ++++++++----- Viewer/package-lock.json | 30 +++++++++++++++--------------- Viewer/package.json | 4 ++-- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/Viewer/features/sharp.js b/Viewer/features/sharp.js index 768bec48..e56857c8 100755 --- a/Viewer/features/sharp.js +++ b/Viewer/features/sharp.js @@ -821,11 +821,14 @@ module.Sharp = core.ImageGridFeatures.Feature({ ['updateImage', function(_, gid){ var that = this - this.cacheMetadata(gid, false) - .then(function([res]){ - res - && that.logger - && that.logger.emit('Cached metadata for', gid) }) }], + // NOTE: as this directly affects the visible lag, this + // must be as fast as possible... + ;((this.images[gid] || {}).metadata || {}).ImageGridMetadata + || this.cacheMetadata(gid, false) + .then(function([res]){ + res + && that.logger + && that.logger.emit('Cached metadata for', gid) }) }], // XXX need to: // - if image too large to set the preview to "loading..." diff --git a/Viewer/package-lock.json b/Viewer/package-lock.json index 174efd96..005f0937 100755 --- a/Viewer/package-lock.json +++ b/Viewer/package-lock.json @@ -269,9 +269,9 @@ } }, "boolean": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", - "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz", + "integrity": "sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==", "optional": true }, "brace-expansion": { @@ -529,9 +529,9 @@ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "core-js": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", - "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz", + "integrity": "sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==", "optional": true }, "core-util-is": { @@ -636,9 +636,9 @@ } }, "electron": { - "version": "9.3.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-9.3.3.tgz", - "integrity": "sha512-xghKeUY1qgnEcJ5w2rXo/toH+8NT2Dktx2aAxBNPV7CIJr3mejJJAPwLbycwtddzr37tgKxHeHlc8ivfKtMkJQ==", + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-9.3.4.tgz", + "integrity": "sha512-OHP8qMKgW8D8GtH+altB22WJw/lBOyyVdoz5e8D0/iPBmJU3Jm93vO4z4Eh/9DvdSXlH8bMHUCMLL9PVW6f+tw==", "requires": { "@electron/get": "^1.0.1", "@types/node": "^12.0.12", @@ -646,9 +646,9 @@ }, "dependencies": { "@types/node": { - "version": "12.19.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.3.tgz", - "integrity": "sha512-8Jduo8wvvwDzEVJCOvS/G6sgilOLvvhn1eMmK3TW8/T217O7u1jdrK6ImKLv80tVryaPSVeKu6sjDEiFjd4/eg==" + "version": "12.19.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.4.tgz", + "integrity": "sha512-o3oj1bETk8kBwzz1WlO6JWL/AfAA3Vm6J1B3C9CsdxHYp7XgPiH7OEXPUbZTndHlRaIElrANkQfe6ZmfJb3H2w==" } } }, @@ -1117,9 +1117,9 @@ "integrity": "sha512-EzT4CP6d6lI8bnknNgT3W8mUQhSVXflO0yPbKD4dKsFcINiC6npjoEBz+8m3VQmWJhc+36pXD4JLwNxUEgzi+Q==" }, "ig-types": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/ig-types/-/ig-types-3.4.2.tgz", - "integrity": "sha512-o/+xDUboKUyXF22iVRNYMxZNH8FeAzJ8qsRM8OQxW1+fLfF9/4iM20Rk+DN7Ctj05RRIkGilRTwKHb9ZITw23A==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/ig-types/-/ig-types-3.5.1.tgz", + "integrity": "sha512-NaozLb8rOogLBDdXT8jL64jFMo8AFvTWqIni7/ubjcq8LO9ME/2uWWXhWOtcmzb/caO04f4lIJ3fLL1Yn5M24g==", "requires": { "ig-object": "^5.2.8", "object-run": "^1.0.1" diff --git a/Viewer/package.json b/Viewer/package.json index c5a4f539..b3f2a229 100755 --- a/Viewer/package.json +++ b/Viewer/package.json @@ -20,7 +20,7 @@ "dependencies": { "app-module-path": "^1.0.6", "async-json": "0.0.2", - "electron": "^9.3.3", + "electron": "^9.3.4", "exif-reader": "^1.0.3", "exiftool": "^0.0.3", "fs-extra": "^7.0.1", @@ -32,7 +32,7 @@ "ig-argv": "^2.15.0", "ig-features": "^3.4.2", "ig-object": "^5.2.8", - "ig-types": "^3.4.2", + "ig-types": "^3.5.1", "moment": "^2.29.1", "object-run": "^1.0.1", "requirejs": "^2.3.6",