|
|
@ -818,6 +818,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) |
|
|
|
var newPeer = newDialog.peer || $scope.curDialog.peer || ''; |
|
|
|
var newPeer = newDialog.peer || $scope.curDialog.peer || ''; |
|
|
|
peerID = AppPeersManager.getPeerID(newPeer); |
|
|
|
peerID = AppPeersManager.getPeerID(newPeer); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (peerID == $scope.curDialog.peerID && oldDialog.messageID == newDialog.messageID) { |
|
|
|
if (peerID == $scope.curDialog.peerID && oldDialog.messageID == newDialog.messageID) { |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
@ -856,10 +857,10 @@ angular.module('myApp.controllers', ['myApp.i18n']) |
|
|
|
} |
|
|
|
} |
|
|
|
if (pos > -1) { |
|
|
|
if (pos > -1) { |
|
|
|
history = $scope.peerHistories[pos]; |
|
|
|
history = $scope.peerHistories[pos]; |
|
|
|
if (pos) { |
|
|
|
// if (pos) {
|
|
|
|
$scope.peerHistories.splice(pos, 1); |
|
|
|
// $scope.peerHistories.splice(pos, 1);
|
|
|
|
$scope.peerHistories.unshift(history); |
|
|
|
// $scope.peerHistories.unshift(history);
|
|
|
|
} |
|
|
|
// }
|
|
|
|
return history; |
|
|
|
return history; |
|
|
|
} |
|
|
|
} |
|
|
|
history = {peerID: peerID, messages: []}; |
|
|
|
history = {peerID: peerID, messages: []}; |
|
|
|