From 991cb896bd936574eeab4c66e5907b71474baee7 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 3 Jul 2017 12:25:05 +0200
Subject: [PATCH] Fix avatar in /pad
---
www/common/cryptpad-common.js | 8 ++++++++
www/common/diffMarked.js | 5 -----
www/file/main.js | 6 +++++-
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 628982c29..5b1a2fc06 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1172,6 +1172,14 @@ define([
return button;
};
+ $(window.document).on('decryption', function (e) {
+ var decrypted = e.originalEvent;
+ if (decrypted.callback) {
+ var cb = decrypted.callback;
+ decrypted.callback = undefined;
+ cb();
+ }
+ });
common.avatarAllowedTypes = [
'image/png',
'image/jpeg',
diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js
index 6d27920aa..a4ce0927f 100644
--- a/www/common/diffMarked.js
+++ b/www/common/diffMarked.js
@@ -171,11 +171,6 @@ define([
}
};
- $(window.document).on('decryption', function (e) {
- var decrypted = e.originalEvent;
- if (decrypted.callback) { decrypted.callback(); }
- });
-
return DiffMd;
});
diff --git a/www/file/main.js b/www/file/main.js
index 638db697d..f58636ed1 100644
--- a/www/file/main.js
+++ b/www/file/main.js
@@ -91,7 +91,11 @@ define([
$(window.document).on('decryption', function (e) {
var decrypted = e.originalEvent;
- if (decrypted.callback) { decrypted.callback(); }
+ if (decrypted.callback) {
+ var cb = decrypted.callback;
+ decrypted.callback = undefined;
+ cb();
+ }
console.log(decrypted);
$dlview.show();