diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-06 18:28:24 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-06 18:28:24 +0100 |
| commit | a73104b5667df8c63a7eafa6678bf557673600e5 (patch) | |
| tree | 9a3368b419fdd0f553d779b2330ed4c4b894d1ad /webclient | |
| parent | Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse (diff) | |
| parent | fix desktop notifs, which were broken in eab463fd (diff) | |
| download | synapse-a73104b5667df8c63a7eafa6678bf557673600e5.tar.xz | |
Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse
Diffstat (limited to 'webclient')
| -rw-r--r-- | webclient/components/matrix/presence-service.js | 2 | ||||
| -rw-r--r-- | webclient/room/room-controller.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webclient/components/matrix/presence-service.js b/webclient/components/matrix/presence-service.js index 952c8ec8a9..b487e3d3bd 100644 --- a/webclient/components/matrix/presence-service.js +++ b/webclient/components/matrix/presence-service.js @@ -24,7 +24,7 @@ angular.module('mPresence', []) .service('mPresence', ['$timeout', 'matrixService', function ($timeout, matrixService) { // 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 var state = undefined; diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index e69adb9b46..c702917fef 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -62,8 +62,8 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) scrollToBottom(); if (window.Notification) { - // Show notification when the user is idle - if (matrixService.presence.offline === mPresence.getState()) { + // Show notification when the window is hidden, or the user is idle + if (document.hidden || matrixService.presence.unavailable === mPresence.getState()) { var notification = new window.Notification( ($scope.members[event.user_id].displayname || event.user_id) + " (" + ($scope.room_alias || $scope.room_id) + ")", // FIXME: don't leak room_ids here |