Merge branch 'password' into staging

This commit is contained in:
yflory
2018-05-03 15:16:03 +02:00
37 changed files with 608 additions and 266 deletions

View File

@@ -552,6 +552,7 @@ define([
ckeditor: editor,
body: $('body'),
onUploaded: function (ev, data) {
// PASSWORD_FILES
var parsed = Hash.parsePadUrl(data.url);
var hexFileName = Util.base64ToHex(parsed.hashData.channel);
var src = '/blob/' + hexFileName.slice(0,2) + '/' + hexFileName;