Merge pull request #32 from matrix-org/read_receipts

Read receipts
This commit is contained in:
David Baker
2015-11-18 14:53:25 +00:00
9 changed files with 209 additions and 39 deletions

View File

@@ -16,6 +16,7 @@ limitations under the License.
var MatrixClientPeg = require("../../MatrixClientPeg");
var RoomListSorter = require("../../RoomListSorter");
var UserActivity = require("../../UserActivity");
var Presence = require("../../Presence");
var dis = require("../../dispatcher");
@@ -104,6 +105,7 @@ module.exports = {
window.localStorage.clear();
}
Notifier.stop();
UserActivity.stop();
Presence.stop();
MatrixClientPeg.get().stopClient();
MatrixClientPeg.get().removeAllListeners();
@@ -362,6 +364,7 @@ module.exports = {
});
});
Notifier.start();
UserActivity.start();
Presence.start();
cli.startClient();
},