Browse Source

Bugfixes

master
Igor Zhukov 11 years ago
parent
commit
9a44924421
  1. 3
      app/css/app.css
  2. 3
      app/js/controllers.js

3
app/css/app.css

@ -1318,7 +1318,6 @@ a.im_dialog:hover .im_dialog_date {
} }
.im_message_grouped .icon-message-status { .im_message_grouped .icon-message-status {
margin-top: 5px; margin-top: 5px;
margin-left: 24px;
} }
.im_message_from_photo, .im_message_from_photo,
@ -1717,7 +1716,6 @@ img.im_message_document_thumb {
} }
.icon-message-status-tick { .icon-message-status-tick {
/*display: inline-block;*/
display: none; display: none;
width: 16px; width: 16px;
height: 10px; height: 10px;
@ -2926,7 +2924,6 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status {
} }
.im_message_grouped .icon-message-status { .im_message_grouped .icon-message-status {
margin-top: -8px; margin-top: -8px;
margin-left: 32px;
} }
} }

3
app/js/controllers.js

@ -406,7 +406,7 @@ angular.module('myApp.controllers', [])
return; return;
} }
if (!hasMore && !$scope.search.query) { if (!hasMore && $scope.search.query) {
contactsShown = true; contactsShown = true;
AppUsersManager.getContacts($scope.search.query).then(function (contactsList) { AppUsersManager.getContacts($scope.search.query).then(function (contactsList) {
@ -612,6 +612,7 @@ angular.module('myApp.controllers', [])
updateHistoryPeer(); updateHistoryPeer();
safeReplaceObject($scope.state, {loaded: true}); safeReplaceObject($scope.state, {loaded: true});
$scope.history = [];
angular.forEach(historyResult.history, function (id) { angular.forEach(historyResult.history, function (id) {
$scope.history.push(AppMessagesManager.wrapForHistory(id)); $scope.history.push(AppMessagesManager.wrapForHistory(id));
}); });

Loading…
Cancel
Save