From a6d2214b84c51e1b675dd6a5a4f1b477bde86258 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Mon, 12 Dec 2016 13:59:36 +0300
Subject: [PATCH] trying to fix safari flicker in conversations list

---
 app/less/app.less                | 12 ++++--------
 app/partials/desktop/dialog.html |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/less/app.less b/app/less/app.less
index 8496f5f6..7aa099f3 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -1296,14 +1296,6 @@ i.icon-verified {
   word-wrap: break-word;
 }
 
-.im_dialog_message_typing,
-.im_dialog_message_wtyping .im_dialog_message_notyping {
-  display: none;
-}
-.im_dialog_message_wtyping .im_dialog_message_typing {
-  display: block;
-}
-
 
 a.im_dialog {
   .im_dialog_chat_from_wrap,
@@ -1432,6 +1424,10 @@ a.im_dialog_selected {
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+.im_dialog_message_wrap {
+  height: 44px;
+  overflow: hidden;
+}
 .im_dialog_message {
   color: #808080;
 }
diff --git a/app/partials/desktop/dialog.html b/app/partials/desktop/dialog.html
index 5c97ee6b..5d4b6536 100644
--- a/app/partials/desktop/dialog.html
+++ b/app/partials/desktop/dialog.html
@@ -16,7 +16,7 @@
 
   <div class="im_dialog_photo pull-left" my-peer-photolink="::dialogMessage.peerID" img-class="im_dialog_photo" watch="true"></div>
 
-  <div class="im_dialog_message_wrap" ng-class="{im_dialog_message_wtyping: dialogMessage.typing > 0}">
+  <div class="im_dialog_message_wrap">
 
     <div class="im_dialog_peer">
       <span my-peer-link="dialogMessage.peerID" verified="true"></span>
@@ -24,7 +24,7 @@
 
     <div ng-switch="dialogMessage.typing ? 'typing' : (!dialogMessage.unreadCount && dialogMessage.draft ? 'draft' : (dialogMessage.deleted ? 'deleted' : 'message'))">
 
-      <div ng-switch-when="typing" class="im_dialog_message im_dialog_message_typing">
+      <div ng-switch-when="typing" class="im_dialog_message">
         <span class="im_short_message_service" my-i18n="im_conversation_group_typing">
           <my-i18n-param name="name"><span my-peer-link="dialogMessage.typing" short="true" class="im_dialog_chat_from_wrap"></span></my-i18n-param><my-i18n-param name="dots"><span my-loading-dots></span></my-i18n-param>
         </span>