r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed empty history state

Browse Source
This commit is contained in:
Igor Zhukov 2014-03-12 23:29:36 +01:00
parent 2dcaa17d85
commit af109eea13
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/js/controllers.js
View File

@ -335,6 +335,7 @@ angular.module('myApp.controllers', [])
StatusManager.start(); StatusManager.start();
$scope.history = []; $scope.history = [];
$scope.historyEmpty = false;
$scope.mediaType = false; $scope.mediaType = false;
$scope.selectedMsgs = {}; $scope.selectedMsgs = {};
$scope.selectedCount = 0; $scope.selectedCount = 0;
@ -446,10 +447,12 @@ angular.module('myApp.controllers', [])
? AppMessagesManager.getSearch($scope.curDialog.inputPeer, '', inputMediaFilter, maxID, startLimit) ? AppMessagesManager.getSearch($scope.curDialog.inputPeer, '', inputMediaFilter, maxID, startLimit)
: AppMessagesManager.getHistory($scope.curDialog.inputPeer, maxID, startLimit); : AppMessagesManager.getHistory($scope.curDialog.inputPeer, maxID, startLimit);
$scope.historyEmpty = false;
getMessagesPromise.then(function (historyResult) { getMessagesPromise.then(function (historyResult) {
if (curJump != jump) return; if (curJump != jump) return;
historyResult.count === 0 ? $scope.mediaEmpty = true : $scope.mediaEmpty = false; $scope.historyEmpty = !historyResult.count;
offset += startLimit; offset += startLimit;
hasMore = offset < historyResult.count; hasMore = offset < historyResult.count;

2
app/partials/im.html
View File

@ -98,7 +98,7 @@
<div class="im_history_scrollable"> <div class="im_history_scrollable">
<div class="im_history" ng-class="{im_history_selectable: selectActions}"> <div class="im_history" ng-class="{im_history_selectable: selectActions}">
<div class="im_history_messages_none" ng-show="mediaEmpty">No messages to display</div> <div class="im_history_messages_none" ng-show="historyEmpty &amp;&amp; !history.length">No messages to display</div>
<div class="im_history_message_wrap" my-message ng-repeat="historyMessage in history"></div> <div class="im_history_message_wrap" my-message ng-repeat="historyMessage in history"></div>
</div> </div>