web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix avatar in /pad

Browse Source
This commit is contained in:
yflory
2017-07-03 12:25:05 +02:00
parent 70c9f3df75
commit 991cb896bd
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/cryptpad-common.js
View File

@@ -1172,6 +1172,14 @@ define([
return button; 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 = [ common.avatarAllowedTypes = [
'image/png', 'image/png',
'image/jpeg', 'image/jpeg',

5
www/common/diffMarked.js
View File

@@ -171,11 +171,6 @@ define([
} }
}; };
$(window.document).on('decryption', function (e) {
var decrypted = e.originalEvent;
if (decrypted.callback) { decrypted.callback(); }
});
return DiffMd; return DiffMd;
}); });

6
www/file/main.js
View File

@@ -91,7 +91,11 @@ define([
$(window.document).on('decryption', function (e) { $(window.document).on('decryption', function (e) {
var decrypted = e.originalEvent; var decrypted = e.originalEvent;
if (decrypted.callback) { decrypted.callback(); } if (decrypted.callback) {
var cb = decrypted.callback;
decrypted.callback = undefined;
cb();
}
console.log(decrypted); console.log(decrypted);
$dlview.show(); $dlview.show();