mirror of
https://github.com/element-hq/element-web
synced 2024-11-27 19:56:47 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
4a81d1cd6b
1 changed files with 6 additions and 4 deletions
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
Copyright 2015, 2016 OpenMarket Ltd
|
Copyright 2015, 2016 OpenMarket Ltd
|
||||||
|
Copyright 2018 New Vector Ltd
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
@ -31,7 +32,7 @@ class Presence {
|
||||||
this.running = true;
|
this.running = true;
|
||||||
if (undefined === this.state) {
|
if (undefined === this.state) {
|
||||||
this._resetTimer();
|
this._resetTimer();
|
||||||
this.dispatcherRef = dis.register(this._onUserActivity.bind(this));
|
this.dispatcherRef = dis.register(this._onAction.bind(this));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -125,9 +126,10 @@ class Presence {
|
||||||
this.setState("unavailable");
|
this.setState("unavailable");
|
||||||
}
|
}
|
||||||
|
|
||||||
_onUserActivity(payload) {
|
_onAction(payload) {
|
||||||
if (payload.action === "sync_state" || payload.action === "self_presence_updated") return;
|
if (payload.action === "user_activity") {
|
||||||
this._resetTimer();
|
this._resetTimer();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue