diff --git a/ui (gen4)/features/core.js b/ui (gen4)/features/core.js index c66a6cd6..dd291ffc 100755 --- a/ui (gen4)/features/core.js +++ b/ui (gen4)/features/core.js @@ -424,12 +424,8 @@ module.Logger = ImageGridFeatures.Feature({ // right at the string start. // // XXX might be a good idea to move this to a more generic spot like lib/util.js... -var doc = -module.doc = -function(strings, ...values){ - return object.normalizeIndent(strings - .map(function(s, i){ return s + (values[i] || '') }) - .join('')) } +var doc = module.doc = object.doc +var text = module.text = object.text // Indicate that an action is not intended for direct use... diff --git a/ui (gen4)/package-lock.json b/ui (gen4)/package-lock.json index 8f5da805..a4535943 100755 --- a/ui (gen4)/package-lock.json +++ b/ui (gen4)/package-lock.json @@ -636,9 +636,9 @@ } }, "electron": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-9.1.0.tgz", - "integrity": "sha512-VRAF8KX1m0py9I9sf0kw1kWfeC87mlscfFcbcRdLBsNJ44/GrJhi3+E8rKbpHUeZNQxsPaVA5Zu5Lxb6dV/scQ==", + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-9.1.2.tgz", + "integrity": "sha512-xEYadr3XqIqJ4ktBPo0lhzPdovv4jLCpiUUGc2M1frUhFhwqXokwhPaTUcE+zfu5+uf/ONDnQApwjzznBsRrgQ==", "requires": { "@electron/get": "^1.0.1", "@types/node": "^12.0.12", @@ -646,9 +646,9 @@ }, "dependencies": { "@types/node": { - "version": "12.12.48", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.48.tgz", - "integrity": "sha512-m3Nmo/YaDUfYzdCQlxjF5pIy7TNyDTAJhIa//xtHcF0dlgYIBKULKnmloCPtByDxtZXrWV8Pge1AKT6/lRvVWg==" + "version": "12.12.53", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.53.tgz", + "integrity": "sha512-51MYTDTyCziHb70wtGNFRwB4l+5JNvdqzFSkbDvpbftEgVUBEE+T5f7pROhWMp/fxp07oNIEQZd5bbfAH22ohQ==" } } }, @@ -1099,9 +1099,9 @@ } }, "ig-object": { - "version": "5.0.13", - "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-5.0.13.tgz", - "integrity": "sha512-qS54wPACTCEXWoZVzY1tvOw0Gyg02caBYWdLpd57gcXeK7O+VQI7P3aoNPJQ9kwvWKmkKM8iH3OYLmGLhWLAiw==" + "version": "5.1.16", + "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-5.1.16.tgz", + "integrity": "sha512-pEc6Q4tBmq7flcB9xQit8X6Bi3q8bimNAaDfnPoLrxOx33jqQn/xFFtJfdmSuqtOSLXK/+ahmdsdScN31i+l+w==" }, "image-size": { "version": "0.5.5", @@ -1217,9 +1217,9 @@ } }, "less": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/less/-/less-3.12.0.tgz", - "integrity": "sha512-3mmSHFRP9hGxxQgAKgChfau1LO3ksV/zyZf1qd2ENyBV778NA9Ids99wFRA20jE+5prT7oScKod8PoGlxSe1gg==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/less/-/less-3.12.2.tgz", + "integrity": "sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==", "dev": true, "requires": { "errno": "^0.1.1", @@ -1418,9 +1418,9 @@ "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==" }, "native-request": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.5.tgz", - "integrity": "sha512-7wU3DvBGAJQxWuMR3F62zrhB7hxNj2DdlC/eBVrCgavc6+ZpFZOqS/PsR7QyUPLMkFk0GvvzoeeOAZGLLnObnA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.7.tgz", + "integrity": "sha512-9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ==", "dev": true, "optional": true }, diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json index affa14c2..b11d1231 100755 --- a/ui (gen4)/package.json +++ b/ui (gen4)/package.json @@ -20,7 +20,7 @@ "dependencies": { "app-module-path": "^1.0.6", "async-json": "0.0.2", - "electron": "^9.1.0", + "electron": "^9.1.2", "exiftool": "^0.0.3", "fs-extra": "^7.0.1", "fs-walk": "^0.0.1", @@ -29,7 +29,7 @@ "guarantee-events": "^1.0.0", "ig-actions": "^3.24.11", "ig-features": "^3.4.2", - "ig-object": "^5.0.13", + "ig-object": "^5.1.16", "moment": "^2.27.0", "object-run": "^1.0.1", "requirejs": "^2.3.6", @@ -55,7 +55,7 @@ "devDependencies": { "asar": "^3.0.1", "electron-rebuild": "^1.11.0", - "less": "^3.12.0" + "less": "^3.12.2" }, "bin": { "ig": "ig.js"