blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse source
This commit is contained in:
yflory 2017-09-15 13:21:45 +02:00
commit a927f40f02
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
www/common/common-messenger.js
View file

@ -129,6 +129,10 @@ define([
return messenger.range_requests[txid];
};
var deleteRangeRequest = function (txid) {
delete messenger.range_requests[txid];
};
messenger.getMoreHistory = function (curvePublic, hash, count, cb) {
if (typeof(cb) !== 'function') { return; }
@ -393,7 +397,8 @@ define([
});
orderMessages(curvePublic, decrypted, req.sig);
return void req.cb(void 0, decrypted);
req.cb(void 0, decrypted);
return deleteRangeRequest(txid);
} else {
console.log(parsed);
}

19
www/contacts/main.js
View file

@ -6,19 +6,21 @@ define([
'/common/common-messenger.js',
'/contacts/messenger-ui.js',
'/bower_components/nthen/index.js',
'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
'less!/customize/src/less/cryptpad.less',
], function ($, Crypto, Toolbar, Cryptpad, Messenger, UI) {
], function ($, Crypto, Toolbar, Cryptpad, Messenger, UI, Nthen) {
var Messages = Cryptpad.Messages;
var APP = window.APP = {
Cryptpad: Cryptpad
};
$(function () {
var andThen = function () {
Nthen(function (waitFor) {
$(waitFor());
}).nThen(function (waitFor) {
Cryptpad.ready(waitFor(Cryptpad.reportAppUsage));
}).nThen(function () {
Cryptpad.addLoadingScreen();
var ifrw = $('#pad-iframe')[0].contentWindow;
@ -56,12 +58,5 @@ define([
var messenger = window.messenger = Messenger.messenger(Cryptpad);
UI.create(messenger, $list, $messages);
};
Cryptpad.ready(function () {
andThen();
Cryptpad.reportAppUsage();
});
});
});

2
www/contacts/messenger-ui.js
View file

@ -129,7 +129,7 @@ define([
console.error('No more messages to fetch');
channel.exhausted = true;
console.log(channel);
return;
return void $moreHistory.addClass('faded');
} else {
channel.TAIL = msg.sig;
}