PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Send an event at the end of user activity too and use this to send RRs.

Browse source
This commit is contained in:
David Baker 2016-01-14 16:01:31 +00:00
parent 11025e2ba9
commit 7e5d4b8ce8
2 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/UserActivity.js
View file

@ -16,7 +16,8 @@ limitations under the License.
var dis = require("./dispatcher");
var MIN_DISPATCH_INTERVAL = 1 * 1000;
var MIN_DISPATCH_INTERVAL = 500;
var CURRENTLY_ACTIVE_THRESHOLD = 500;
/**
* This class watches for user activity (moving the mouse or pressing a key)
@ -38,6 +39,7 @@ class UserActivity {
window.addEventListener('wheel', this._onUserActivity.bind(this), true);
this.lastActivityAtTs = new Date().getTime();
this.lastDispatchAtTs = 0;
this.activityEndTimer = undefined;
}
/**
@ -49,6 +51,14 @@ class UserActivity {
window.removeEventListener('wheel', this._onUserActivity.bind(this), true);
}
/**
* Return true if there has been user activity very recently
* (ie. within a few seconds)
*/
userCurrentlyActive() {
return this.lastActivityAtTs > (new Date).getTime() - CURRENTLY_ACTIVE_THRESHOLD;
}
_onUserActivity(event) {
if (event.screenX && event.type == "mousemove") {
if (event.screenX === this.lastScreenX &&
@ -67,6 +77,26 @@ class UserActivity {
dis.dispatch({
action: 'user_activity'
});
if (!this.activityEndTimer) {
this.activityEndTimer = setTimeout(
this._onActivityEndTimer.bind(this), MIN_DISPATCH_INTERVAL
);
}
}
}
_onActivityEndTimer() {
var now = (new Date).getTime();
var targetTime = this.lastActivityAtTs + MIN_DISPATCH_INTERVAL;
if (now >= targetTime) {
dis.dispatch({
action: 'user_activity_end'
});
this.activityEndTimer = undefined;
} else {
this.activityEndTimer = setTimeout(
this._onActivityEndTimer.bind(this), targetTime - now
);
}
}
}

6
src/components/structures/RoomView.js
View file

@ -220,6 +220,12 @@ module.exports = React.createClass({
break;
case 'user_activity':
case 'user_activity_end':
// we could treat user_activity_end differently and not
// send receipts for messages that have arrived between
// the actual user activity and the time they stopped
// being active, but let's see if this is actually
// necessary.
this.sendReadReceipt();
break;
}