From 8b82aba6f2d71c637c0ac30b85724ade80b8b30e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFs=20Poujade?= <lois.poujade@tetras-libre.fr>
Date: Thu, 28 Apr 2022 16:47:20 +0200
Subject: [PATCH] add link to original image; show edited by default
---
capsule-prototype/index.html | 1 +
capsule-prototype/js/online-script.js | 13 ++++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/capsule-prototype/index.html b/capsule-prototype/index.html
index 40af2e8..8caea83 100644
--- a/capsule-prototype/index.html
+++ b/capsule-prototype/index.html
@@ -127,6 +127,7 @@
<img id="popupImg" src="file/rekall_cache/568261E53001FA741A069C684C6E25E7571006E8-45972424CDE1275C6FDD9DD7D52216C878F04AB8.jpg"/>
<div class="popupLeftItem" id="popupType"></div>
<div class='popupLeftItem' id='editAnnotationPic'></div>
+ <div class='popupLeftItem' id='linkToOriginalImage'>open original image</div>
</div>
<div class="editmode" id="popupEditSupprimer">Delete file</div>
</td>
diff --git a/capsule-prototype/js/online-script.js b/capsule-prototype/js/online-script.js
index 7032a23..250e4cc 100644
--- a/capsule-prototype/js/online-script.js
+++ b/capsule-prototype/js/online-script.js
@@ -1004,11 +1004,10 @@ function fillPopupEdit(tag) {
$("#popupImg").click(function(event){
event.stopPropagation();
if(tag.isLink()) {
- if(link != "")
- window.open(link,'_blank');
+ if(link != "") window.open(link,'_blank');
}
else
- tag.openBrowser();
+ window.open($('#popupImg')[0].src, '_blank');
});
}
@@ -1016,9 +1015,13 @@ function fillPopupEdit(tag) {
window.my_current_markerjs_data_in_ugly_global = null;
$('#editAnnotationPic').hide();
+ $('#linkToOriginalImage').hide();
if (type.split('/')[0] == 'image') {
- $('#editAnnotationPic').html('edit');
- $('#editAnnotationPic').show();
+ $('#editAnnotationPic').html('edit');
+ $('#editAnnotationPic').show();
+ $('#linkToOriginalImage').show();
+ $('#linkToOriginalImage').unbind('click');
+ $('#linkToOriginalImage').click(() => tag.openBrowser());
var data = tag.getMetadata('Rekall->MarkerjsState');
if (data)
window.my_current_markerjs_data_in_ugly_global = JSON.parse(atob(data));
--
GitLab