Merge remote-tracking branch 'origin/develop' into read_receipts

This commit is contained in:
David Baker 2015-11-05 15:33:50 +00:00
commit 7882780357

View file

@ -297,7 +297,8 @@ module.exports = {
var Notifier = sdk.getComponent('organisms.Notifier'); var Notifier = sdk.getComponent('organisms.Notifier');
var cli = MatrixClientPeg.get(); var cli = MatrixClientPeg.get();
var self = this; var self = this;
cli.on('syncComplete', function() { cli.on('sync', function(state) {
if (self.sdkReady || state !== "PREPARED") { return; }
self.sdkReady = true; self.sdkReady = true;
if (self.starting_room_alias) { if (self.starting_room_alias) {