imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #242 from matrix-org/rav/read_marker

Browse source 
Make the read-marker less annoying
This commit is contained in:
Richard van der Hoff 2016-03-22 17:37:14 +00:00
commit 0737d89d57
2 changed files with 4 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/UserActivity.js
View file

@ -17,7 +17,7 @@ limitations under the License.
var dis = require("./dispatcher"); var dis = require("./dispatcher");
var MIN_DISPATCH_INTERVAL_MS = 500; var MIN_DISPATCH_INTERVAL_MS = 500;
var CURRENTLY_ACTIVE_THRESHOLD_MS = 500; var CURRENTLY_ACTIVE_THRESHOLD_MS = 2000;
/** /**
* This class watches for user activity (moving the mouse or pressing a key) * This class watches for user activity (moving the mouse or pressing a key)

23
src/components/structures/TimelinePanel.js
View file

@ -26,16 +26,12 @@ var MatrixClientPeg = require("../../MatrixClientPeg");
var dis = require("../../dispatcher"); var dis = require("../../dispatcher");
var ObjectUtils = require('../../ObjectUtils'); var ObjectUtils = require('../../ObjectUtils');
var Modal = require("../../Modal"); var Modal = require("../../Modal");
var UserActivity = require("../../UserActivity");
var PAGINATE_SIZE = 20; var PAGINATE_SIZE = 20;
var INITIAL_SIZE = 20; var INITIAL_SIZE = 20;
var TIMELINE_CAP = 500; // the most events to show in a timeline var TIMELINE_CAP = 500; // the most events to show in a timeline
// consider that the user remains "active" for this many milliseconds after a
// user_activity event (and thus don't make the read-marker visible on new
// events)
var CONSIDER_USER_ACTIVE_FOR_MS = 500;
var DEBUG = false; var DEBUG = false;
if (DEBUG) { if (DEBUG) {
@ -114,7 +110,6 @@ var TimelinePanel = React.createClass({
debuglog("TimelinePanel: mounting"); debuglog("TimelinePanel: mounting");
this.last_rr_sent_event_id = undefined; this.last_rr_sent_event_id = undefined;
this._resetActivityTimer();
this.dispatcherRef = dis.register(this.onAction); this.dispatcherRef = dis.register(this.onAction);
MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline); MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
@ -210,10 +205,6 @@ var TimelinePanel = React.createClass({
onAction: function(payload) { onAction: function(payload) {
switch (payload.action) { switch (payload.action) {
case 'user_activity': case 'user_activity':
this._resetActivityTimer();
// fall-through!
case 'user_activity_end': case 'user_activity_end':
// we could treat user_activity_end differently and not // we could treat user_activity_end differently and not
// send receipts for messages that have arrived between // send receipts for messages that have arrived between
@ -226,10 +217,6 @@ var TimelinePanel = React.createClass({
} }
}, },
_resetActivityTimer: function() {
this.user_last_active = Date.now();
},
onRoomTimeline: function(ev, room, toStartOfTimeline, removed, data) { onRoomTimeline: function(ev, room, toStartOfTimeline, removed, data) {
// ignore events for other rooms // ignore events for other rooms
if (room !== this.props.room) return; if (room !== this.props.room) return;
@ -245,17 +232,13 @@ var TimelinePanel = React.createClass({
// when a new event arrives when the user is not watching the window, but the // when a new event arrives when the user is not watching the window, but the
// window is in its auto-scroll mode, make sure the read marker is visible. // window is in its auto-scroll mode, make sure the read marker is visible.
// //
// We consider the user to be watching the window if they performed an action
// less than CONSIDER_USER_ACTIVE_FOR_MS ago.
//
// We ignore events we have sent ourselves; we don't want to see the // We ignore events we have sent ourselves; we don't want to see the
// read-marker when a remote echo of an event we have just sent takes // read-marker when a remote echo of an event we have just sent takes
// more than CONSIDER_USER_ACTIVE_FOR_MS. // more than the timeout on userCurrentlyActive.
// //
var myUserId = MatrixClientPeg.get().credentials.userId; var myUserId = MatrixClientPeg.get().credentials.userId;
var sender = ev.sender ? ev.sender.userId : null; var sender = ev.sender ? ev.sender.userId : null;
var activity_age = Date.now() - this.user_last_active; if (sender != myUserId && !UserActivity.userCurrentlyActive()) {
if (sender != myUserId && activity_age > CONSIDER_USER_ACTIVE_FOR_MS) {
this.setState({readMarkerVisible: true}); this.setState({readMarkerVisible: true});
} }