Merge branch 'pr/1360'
This commit is contained in:
commit
fb1f274eba
@ -456,7 +456,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
|
|||||||
var pendingAttachment = false
|
var pendingAttachment = false
|
||||||
$scope.$on('history_focus', function (e, peerData) {
|
$scope.$on('history_focus', function (e, peerData) {
|
||||||
if (peerData.peerString == $scope.curDialog.peer &&
|
if (peerData.peerString == $scope.curDialog.peer &&
|
||||||
peerData.messageID == $scope.curDialog.messageID &&
|
(peerData.messageID ? peerData.messageID == $scope.curDialog.messageID : !$scope.curDialog.messageID) &&
|
||||||
!peerData.startParam) {
|
!peerData.startParam) {
|
||||||
if (peerData.messageID) {
|
if (peerData.messageID) {
|
||||||
$scope.$broadcast('ui_history_change_scroll', true)
|
$scope.$broadcast('ui_history_change_scroll', true)
|
||||||
|
Loading…
Reference in New Issue
Block a user