Browse Source

Fixed typing on loading

master
Igor Zhukov 10 years ago
parent
commit
eb29e89a06
  1. 1
      app/js/controllers.js
  2. 2
      app/partials/desktop/im.html

1
app/js/controllers.js

@ -1229,6 +1229,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) @@ -1229,6 +1229,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
if (prerenderedLen && (maxID || backLimit)) {
prerenderedLen = 0;
peerHistory.messages = [];
$scope.state.empty = true;
}
var curJump = ++jump,

2
app/partials/desktop/im.html

@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
<div class="im_history_typing_wrap">
<div class="im_history_typing" ng-show="historyState.typing.length > 0 &amp;&amp; !historyFilter.mediaType &amp;&amp; state.loaded" ng-switch="historyState.typing.length" my-i18n>
<div class="im_history_typing" ng-show="historyState.typing.length > 0 &amp;&amp; !historyFilter.mediaType &amp;&amp; !state.empty" ng-switch="historyState.typing.length" my-i18n>
<span ng-switch-when="1" my-i18n-format="im_one_typing"></span>
<span ng-switch-when="2" my-i18n-format="im_two_typing"></span>
<span ng-switch-default my-i18n-format="im_many_typing"></span>

Loading…
Cancel
Save