From 8bb6bd86862a97261bf2b814bc1ac10588b311e5 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 23 Nov 2020 16:19:12 +0300 Subject: [PATCH] fixed bug with copy image path... Signed-off-by: Alex A. Naanou --- Viewer/features/app.js | 4 ++++ Viewer/features/examples.js | 2 ++ Viewer/features/sharp.js | 2 -- Viewer/features/ui-progress.js | 1 + Viewer/package-lock.json | 21 +++++++-------------- Viewer/package.json | 4 ++-- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/Viewer/features/app.js b/Viewer/features/app.js index ff9ce4ab..c416c9da 100755 --- a/Viewer/features/app.js +++ b/Viewer/features/app.js @@ -441,6 +441,10 @@ var ElectronHostActions = actions.Actions({ //*/ var that = this var url = this.images.getBestPreview(this.current, size, true).url + // compatibility -- windows paths... + url = process.platform.startsWith('win') ? + url.replace(/\//g, '\\') + : url img2canvas({ url, ...this.images[this.current] diff --git a/Viewer/features/examples.js b/Viewer/features/examples.js index 887035e1..4b00aa19 100755 --- a/Viewer/features/examples.js +++ b/Viewer/features/examples.js @@ -300,6 +300,8 @@ module.Example = core.ImageGridFeatures.Feature({ console.log('PRE') return function(){ console.log('POST') } }], + ['exampleActionFull', + 'exampleAction: "alias handler!" ... -- some doc...'], ], }) diff --git a/Viewer/features/sharp.js b/Viewer/features/sharp.js index 9f5a8d4b..d95bd2e1 100755 --- a/Viewer/features/sharp.js +++ b/Viewer/features/sharp.js @@ -606,12 +606,10 @@ var SharpActions = actions.Actions({ console.log('### ABORT:\n ', logger && logger.log.length, reason, res) - /* logger && logger.emit('close') && reason == 'aborted' && logger.emit(res) - //*/ delete that.__cache_metadata_reading }) // handle logging and processing list... diff --git a/Viewer/features/ui-progress.js b/Viewer/features/ui-progress.js index 29dd6637..10298b46 100755 --- a/Viewer/features/ui-progress.js +++ b/Viewer/features/ui-progress.js @@ -77,6 +77,7 @@ var ProgressActions = actions.Actions({ ], close: [ 'end', + 'abort', ], error: [ ], diff --git a/Viewer/package-lock.json b/Viewer/package-lock.json index d029eaff..543ca2b5 100755 --- a/Viewer/package-lock.json +++ b/Viewer/package-lock.json @@ -1073,18 +1073,11 @@ "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" }, "ig-actions": { - "version": "3.24.11", - "resolved": "https://registry.npmjs.org/ig-actions/-/ig-actions-3.24.11.tgz", - "integrity": "sha512-KIe9qeNs+UYGpMQKijqGl6yjHhRGUss2mof323jS3/L11vzrALPRpyciWopSqhGQXsB/U8fXsr5cRbYaBW7+wA==", + "version": "3.24.13", + "resolved": "https://registry.npmjs.org/ig-actions/-/ig-actions-3.24.13.tgz", + "integrity": "sha512-x7+37fJ1wsdSl/VNb4W569IHiUx2SKtEr76PI6LxXOW3fRkv6/9KnDXJK8pL+XVO012oj096WatYK80aPUlLPQ==", "requires": { - "ig-object": "^3.0.0" - }, - "dependencies": { - "ig-object": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-3.3.2.tgz", - "integrity": "sha512-O95A+n5F+ZAjp2buXfdblIITJ4E+DdSsFWp03CMb/jew8eNzhZ3dz8XhMKO67CXIKjqhZ+cahJygoT7ds0nBWA==" - } + "ig-object": "^5.0.2" } }, "ig-argv": { @@ -1117,9 +1110,9 @@ "integrity": "sha512-WPPQ5C41c6q3tPfa2fBbWE2xcLF7LoGRu2E6Wr/aoA5oxAyl8lAuE7Kqt4TyPwfW9jVI0+ifBztg9e1tR5mG1Q==" }, "ig-types": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ig-types/-/ig-types-4.1.0.tgz", - "integrity": "sha512-FTpXOA5bZUkRup1vJ4cD76/zkXPtjaFHLp9oNbP18qDUc0pEB/pLx8fdgNDwYGDWnFhetx0pMTuP11KOh2urTA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/ig-types/-/ig-types-4.1.2.tgz", + "integrity": "sha512-IYnuBWw7m7qvtW21ggoodFA++v+bHwNMqGRvo9w2IwfI3leVPbOORUC5CjUKb4q/ffGlCcT3gC7w+E/aO8BOTw==", "requires": { "ig-object": "^5.4.11", "object-run": "^1.0.1" diff --git a/Viewer/package.json b/Viewer/package.json index 49a306f1..b1ef8891 100755 --- a/Viewer/package.json +++ b/Viewer/package.json @@ -28,11 +28,11 @@ "generic-walk": "^1.4.0", "glob": "^7.1.6", "guarantee-events": "^1.0.0", - "ig-actions": "^3.24.11", + "ig-actions": "^3.24.13", "ig-argv": "^2.15.0", "ig-features": "^3.4.2", "ig-object": "^5.4.11", - "ig-types": "^4.1.0", + "ig-types": "^4.1.2", "moment": "^2.29.1", "object-run": "^1.0.1", "requirejs": "^2.3.6",