diff --git a/app/css/app.css b/app/css/app.css index 48d16be0..dba0d30b 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -792,6 +792,19 @@ a.im_dialog:hover .im_dialog_date { -webkit-user-select: text; } +.im_history_messages_none.ng-hide { + display: none; +} + +.im_history_messages_none { + display: block; + padding: 100px 50px 0; + + text-align: center; + color: #999; + font-size: 1.5em; +} + .im_history_to_bottom { position: relative; } @@ -2286,4 +2299,4 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status { } .peer_select_modal_wrap .modal-body { padding: 10px 10px 15px; -} \ No newline at end of file +} diff --git a/app/js/controllers.js b/app/js/controllers.js index 0545bbd0..ec7cda06 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -449,6 +449,8 @@ angular.module('myApp.controllers', []) getMessagesPromise.then(function (historyResult) { if (curJump != jump) return; + historyResult.count === 0 ? $scope.mediaEmpty = true : $scope.mediaEmpty = false; + offset += startLimit; hasMore = offset < historyResult.count; maxID = historyResult.history[historyResult.history.length - 1]; diff --git a/app/partials/im.html b/app/partials/im.html index 36f23b90..6dd6337e 100644 --- a/app/partials/im.html +++ b/app/partials/im.html @@ -98,6 +98,7 @@