|
|
@ -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) |
|
|
@ -603,10 +603,6 @@ angular.module('myApp.controllers', ['myApp.i18n']) |
|
|
|
$rootScope.$broadcast('history_focus', params) |
|
|
|
$rootScope.$broadcast('history_focus', params) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$scope.scrollChatToBottom = function () { |
|
|
|
|
|
|
|
$scope.$broadcast('ui_history_change_scroll', true) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$scope.logOut = function () { |
|
|
|
$scope.logOut = function () { |
|
|
|
ErrorService.confirm({type: 'LOGOUT'}).then(function () { |
|
|
|
ErrorService.confirm({type: 'LOGOUT'}).then(function () { |
|
|
|
MtpApiManager.logOut().then(function () { |
|
|
|
MtpApiManager.logOut().then(function () { |
|
|
|