|
|
@ -1580,12 +1580,22 @@ angular.module('myApp.controllers', ['myApp.i18n']) |
|
|
|
|
|
|
|
|
|
|
|
var promise = index >= list.length ? loadMore() : $q.when(); |
|
|
|
var promise = index >= list.length ? loadMore() : $q.when(); |
|
|
|
promise.then(function () { |
|
|
|
promise.then(function () { |
|
|
|
if (curJump != jump) { |
|
|
|
if (curJump != jump || !hasMore) { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$scope.messageID = list[index]; |
|
|
|
var messageID = list[index]; |
|
|
|
$scope.photoID = AppMessagesManager.getMessage($scope.messageID).media.photo.id; |
|
|
|
var message = AppMessagesManager.getMessage(messageID); |
|
|
|
|
|
|
|
if (!message || |
|
|
|
|
|
|
|
!message.media || |
|
|
|
|
|
|
|
!message.media.photo || |
|
|
|
|
|
|
|
!message.media.photo.id) { |
|
|
|
|
|
|
|
console.error('Invalid photo message', index, list, messageID, message); |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$scope.messageID = messageID; |
|
|
|
|
|
|
|
$scope.photoID = message.media.photo.id; |
|
|
|
$scope.photo = AppPhotosManager.wrapForFull($scope.photoID); |
|
|
|
$scope.photo = AppPhotosManager.wrapForFull($scope.photoID); |
|
|
|
|
|
|
|
|
|
|
|
updatePrevNext(); |
|
|
|
updatePrevNext(); |
|
|
@ -1653,6 +1663,8 @@ angular.module('myApp.controllers', ['myApp.i18n']) |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
loadMore(); |
|
|
|
|
|
|
|
|
|
|
|
}) |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
.controller('UserpicModalController', function ($q, $scope, $rootScope, $modalInstance, AppPhotosManager, AppUsersManager, AppPeersManager, AppMessagesManager, PeersSelectService, ErrorService) { |
|
|
|
.controller('UserpicModalController', function ($q, $scope, $rootScope, $modalInstance, AppPhotosManager, AppUsersManager, AppPeersManager, AppMessagesManager, PeersSelectService, ErrorService) { |
|
|
|