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

Merge branch 'refactor' into staging

Browse Source
This commit is contained in:
yflory
2017-04-13 14:44:55 +02:00
parent df4a250359 daabb0b3ad
commit 3ba90332bb
5 changed files with 971 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -381,8 +381,9 @@ load pinpad dynamically only after you know that it will be needed */
});
return templates;
};
var addTemplate = common.addTemplate = function (href) {
getStore().addTemplate(href);
var addTemplate = common.addTemplate = function (data) {
getStore().pushData(data);
getStore().addPad(data.href, ['template']);
};
var isTemplate = common.isTemplate = function (href) {
@@ -692,7 +693,7 @@ load pinpad dynamically only after you know that it will be needed */
var userChannel = common.parseHash(userHash).channel;
if (!userChannel) { return null; }
var list = fo.getFilesDataFiles().map(hrefToHexChannelId)
var list = fo.getFiles([fo.FILES_DATA]).map(hrefToHexChannelId)
.filter(function (x) { return x; });
list.push(common.base64ToHex(userChannel));