MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-14 22:43:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse

Browse source
This commit is contained in:
Erik Johnston 2014-09-06 18:28:24 +01:00
commit a73104b566
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webclient/components/matrix/presence-service.js
View file

@ -24,7 +24,7 @@ angular.module('mPresence', [])
.service('mPresence', ['$timeout', 'matrixService', function ($timeout, matrixService) { .service('mPresence', ['$timeout', 'matrixService', function ($timeout, matrixService) {
// Time in ms after that a user is considered as unavailable/away // Time in ms after that a user is considered as unavailable/away
var UNAVAILABLE_TIME = 5 * 60000; // 5 mins var UNAVAILABLE_TIME = 3 * 60000; // 3 mins
// The current presence state // The current presence state
var state = undefined; var state = undefined;

4
webclient/room/room-controller.js
View file

@ -62,8 +62,8 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
scrollToBottom(); scrollToBottom();
if (window.Notification) { if (window.Notification) {
// Show notification when the user is idle // Show notification when the window is hidden, or the user is idle
if (matrixService.presence.offline === mPresence.getState()) { if (document.hidden || matrixService.presence.unavailable === mPresence.getState()) {
var notification = new window.Notification( var notification = new window.Notification(
($scope.members[event.user_id].displayname || event.user_id) + ($scope.members[event.user_id].displayname || event.user_id) +
" (" + ($scope.room_alias || $scope.room_id) + ")", // FIXME: don't leak room_ids here " (" + ($scope.room_alias || $scope.room_id) + ")", // FIXME: don't leak room_ids here