From eb29e89a06e0451e9cd12c1cc8c301db8a800809 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Mon, 13 Apr 2015 18:53:15 +0300
Subject: [PATCH] Fixed typing on loading

---
 app/js/controllers.js        | 1 +
 app/partials/desktop/im.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/js/controllers.js b/app/js/controllers.js
index 13d33598..f1bb39a7 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -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,
diff --git a/app/partials/desktop/im.html b/app/partials/desktop/im.html
index 32f71181..bac088d7 100644
--- a/app/partials/desktop/im.html
+++ b/app/partials/desktop/im.html
@@ -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>