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

Manual merge, update the CSS in loading.js and document that loading.less does nothing.

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-09-14 10:48:35 +02:00
parent 8a32b72ffc 4d688289cc
commit b24e9b84af
29 changed files with 177 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/common/sframe-common.js
View File

@@ -77,7 +77,6 @@ define([
funcs.openTemplatePicker = callWithCommon(UI.openTemplatePicker);
funcs.displayAvatar = callWithCommon(UI.displayAvatar);
funcs.createButton = callWithCommon(UI.createButton);
funcs.getFileSize = callWithCommon(UI.getFileSize);
// History
funcs.getHistory = callWithCommon(History.create);
@@ -106,6 +105,19 @@ define([
}
return;
};
funcs.getFileSize = function (href, cb) {
var channelId = Cryptpad.hrefToHexChannelId(href);
funcs.sendAnonRpcMsg("GET_FILE_SIZE", channelId, function (data) {
if (!data) { return void cb("No response"); }
if (data.error) { return void cb(data.error); }
if (data.response && data.response.length && typeof(data.response[0]) === 'number') {
return void cb(void 0, data.response[0]);
} else {
cb('INVALID_RESPONSE');
}
});
};
// CodeMirror
funcs.initCodeMirrorApp = callWithCommon(CodeMirror.create);