Browse Source

Added curPeerId check for notifications on mobile

Closes #270
master
Igor Zhukov 11 years ago
parent
commit
0ddf417726
  1. 1
      app/js/controllers.js
  2. 8
      app/js/services.js

1
app/js/controllers.js

@ -701,6 +701,7 @@ angular.module('myApp.controllers', []) @@ -701,6 +701,7 @@ angular.module('myApp.controllers', [])
return false;
}
$rootScope.selectedPeerID = peerID;
$scope.curDialog.peerID = peerID;
$scope.curDialog.inputPeer = AppPeersManager.getInputPeer(newPeer);
$scope.historyFilter.mediaType = false;

8
app/js/services.js

@ -2021,7 +2021,9 @@ angular.module('myApp.services', []) @@ -2021,7 +2021,9 @@ angular.module('myApp.services', [])
$rootScope.$broadcast('dialogs_update', dialog);
if ($rootScope.idle.isIDLE && !message.out && message.unread) {
if ((Config.Navigator.mobile && $rootScope.selectedPeerID != peerID || $rootScope.idle.isIDLE) &&
!message.out &&
message.unread) {
NotificationsManager.getPeerMuted(peerID).then(function (muted) {
if (!message.unread || muted) {
return;
@ -3217,6 +3219,10 @@ angular.module('myApp.services', []) @@ -3217,6 +3219,10 @@ angular.module('myApp.services', [])
if (!started) {
started = true;
$($window).on('blur focus keydown mousedown touchstart', onEvent);
setTimeout(function () {
onEvent({type: 'blur'});
}, 0);
}
}

Loading…
Cancel
Save