From 3967b93d9946687c70a534cf374f8dd3d21f04cb Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Wed, 20 Apr 2016 18:14:02 +0300
Subject: [PATCH] Fixed conversation typing in Safari

---
 app/less/app.less                |  9 +++++++++
 app/partials/desktop/dialog.html |  8 ++++----
 app/partials/mobile/dialog.html  | 10 +++++-----
 app/webogram.appcache            |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/less/app.less b/app/less/app.less
index 4db3b6a7..03efc7bb 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -1293,6 +1293,15 @@ 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,
   .im_short_message_media,
diff --git a/app/partials/desktop/dialog.html b/app/partials/desktop/dialog.html
index b039d40a..95e9e247 100644
--- a/app/partials/desktop/dialog.html
+++ b/app/partials/desktop/dialog.html
@@ -16,21 +16,21 @@
 
   <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">
+  <div class="im_dialog_message_wrap" ng-class="{im_dialog_message_wtyping: dialogMessage.typing > 0}">
 
     <div class="im_dialog_peer">
       <span my-peer-link="dialogMessage.peerID" verified="true"></span>
     </div>
 
-    <div ng-if="dialogMessage.typing > 0" class="im_dialog_message">
+    <div ng-if="dialogMessage.typing > 0" class="im_dialog_message im_dialog_message_typing">
       <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>
     </div>
 
-    <div ng-show="!dialogMessage.typing" ng-switch="dialogMessage.deleted">
+    <div class="im_dialog_message_notyping" ng-switch="dialogMessage.deleted">
       <div ng-switch-when="true" class="im_dialog_message">
-        <span class="im_dialog_message_text" my-i18n="conversation_message_deleted"></span>
+        <span class="im_short_message_text" my-i18n="conversation_message_deleted"></span>
       </div>
       <div ng-switch-default class="im_dialog_message">
         <span ng-switch="dialogMessage.peerID > 0 || dialogMessage.fromID < 0">
diff --git a/app/partials/mobile/dialog.html b/app/partials/mobile/dialog.html
index 5c692e8f..95e9e247 100644
--- a/app/partials/mobile/dialog.html
+++ b/app/partials/mobile/dialog.html
@@ -16,21 +16,21 @@
 
   <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">
+  <div class="im_dialog_message_wrap" ng-class="{im_dialog_message_wtyping: dialogMessage.typing > 0}">
 
     <div class="im_dialog_peer">
       <span my-peer-link="dialogMessage.peerID" verified="true"></span>
     </div>
 
-    <div ng-if="dialogMessage.typing > 0" class="im_dialog_message">
-      <span class="im_dialog_message_service" my-i18n="im_conversation_group_typing">
+    <div ng-if="dialogMessage.typing > 0" class="im_dialog_message im_dialog_message_typing">
+      <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>
     </div>
 
-    <div ng-show="!dialogMessage.typing" ng-switch="dialogMessage.deleted">
+    <div class="im_dialog_message_notyping" ng-switch="dialogMessage.deleted">
       <div ng-switch-when="true" class="im_dialog_message">
-        <span class="im_dialog_message_text" my-i18n="conversation_message_deleted"></span>
+        <span class="im_short_message_text" my-i18n="conversation_message_deleted"></span>
       </div>
       <div ng-switch-default class="im_dialog_message">
         <span ng-switch="dialogMessage.peerID > 0 || dialogMessage.fromID < 0">
diff --git a/app/webogram.appcache b/app/webogram.appcache
index e361ab64..9a0a5e8a 100644
--- a/app/webogram.appcache
+++ b/app/webogram.appcache
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# 63
+# 64
 
 NETWORK:
 *