diff --git a/app/css/app.css b/app/css/app.css index 63f16628..a109e27a 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -818,6 +818,14 @@ a.im_dialog:hover .im_dialog_date { -webkit-user-select: text; } +.im_history_empty { + padding: 100px 50px 0; + + text-align: center; + color: #999; + font-size: 1.5em; +} + .im_history_to_bottom { position: relative; } @@ -2510,4 +2518,3 @@ ce671b orange .user_color_7:hover {color: #2996ad;} .user_color_8, .user_color_8:hover {color: #ce671b;} - diff --git a/app/js/controllers.js b/app/js/controllers.js index ccc77b8f..50d3a531 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -337,6 +337,7 @@ angular.module('myApp.controllers', []) StatusManager.start(); $scope.history = []; + $scope.historyEmpty = false; $scope.mediaType = false; $scope.selectedMsgs = {}; $scope.selectedCount = 0; @@ -449,10 +450,14 @@ angular.module('myApp.controllers', []) ? AppMessagesManager.getSearch($scope.curDialog.inputPeer, '', inputMediaFilter, maxID, startLimit) : AppMessagesManager.getHistory($scope.curDialog.inputPeer, maxID); + $scope.historyEmpty = false; + getMessagesPromise.then(function (historyResult) { if (curJump != jump) return; offset += historyResult.history.length; + $scope.historyEmpty = !historyResult.count; + hasMore = offset < historyResult.count; maxID = historyResult.history[historyResult.history.length - 1]; diff --git a/app/partials/im.html b/app/partials/im.html index 735e2e22..346c6b76 100644 --- a/app/partials/im.html +++ b/app/partials/im.html @@ -87,6 +87,7 @@