From 87f82fcbc15cd6b2ad1ceb73d86265a1e3c4d6b0 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Wed, 10 Feb 2016 16:44:40 +0000
Subject: [PATCH] Fixed mobile transitions

---
 app/less/mobile.less          | 5 +++++
 app/partials/mobile/head.html | 8 ++++----
 app/partials/mobile/im.html   | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/less/mobile.less b/app/less/mobile.less
index e40c09d5..552146c7 100644
--- a/app/less/mobile.less
+++ b/app/less/mobile.less
@@ -226,6 +226,11 @@ html {
 .tg_modal_head .navbar-search-wrap {
   display: block;
 }
+.tg_head_peer_menu_wrap {
+  .navbar_peer_not_selected & {
+    display: none;
+  }
+}
 
 .tg_page_head {
   .navbar-quick-nav {
diff --git a/app/partials/mobile/head.html b/app/partials/mobile/head.html
index ec5b9304..1e1f06b8 100644
--- a/app/partials/mobile/head.html
+++ b/app/partials/mobile/head.html
@@ -5,20 +5,20 @@
 
       <a class="navbar-peer-wrap" my-peer-photolink="historyPeer.id" peer-watch="true"></a>
 
-      <div class="navbar-toggle-wrap dropdown" dropdown>
+      <div class="navbar-toggle-wrap dropdown" dropdown ng-switch="!curDialog.peer">
         <a class="dropdown-toggle navbar-toggle" dropdown-toggle>
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </a>
-        <ul ng-if="!curDialog.peer" class="dropdown-menu">
+        <ul ng-switch-when="true" class="dropdown-menu">
           <li><a ng-click="openGroup()" my-i18n="head_new_group"></a></li>
           <li><a ng-click="importContact()" my-i18n="head_new_contact"></a></li>
           <li ng-if="!isEmpty.contacts"><a ng-click="openContacts()" my-i18n="head_contacts"></a></li>
           <li><a ng-click="openSettings()" my-i18n="head_settings"></a></li>
           <li><a ng-click="logOut()" my-i18n="head_log_out"></a></li>
         </ul>
-        <ul ng-if="curDialog.peer" class="dropdown-menu">
+        <ul ng-switch-default class="dropdown-menu">
           <li><a ng-click="toggleEdit()" my-i18n="head_edit_messages"></a></li>
           <li ng-if="!historyFilter.mediaType" class="divider"></li>
           <li ng-if="!historyFilter.mediaType"><a ng-click="toggleMedia('photos')" my-i18n="head_media_photos"></a></li>
@@ -38,7 +38,7 @@
 
         <span class="tg_head_logo"></span></a>
 
-        <div ng-show="curDialog.peer" ng-switch="curDialog.peer &amp;&amp; historyFilter.mediaType.length > 0">
+        <div class="tg_head_peer_menu_wrap" ng-switch="curDialog.peer &amp;&amp; historyFilter.mediaType.length > 0">
           <ul ng-switch-when="true" class="nav navbar-nav navbar-quick-nav">
             <li>
               <a ng-click="toggleMedia()" class="navbar-quick-media-back">
diff --git a/app/partials/mobile/im.html b/app/partials/mobile/im.html
index ea309ccb..87f68c05 100644
--- a/app/partials/mobile/im.html
+++ b/app/partials/mobile/im.html
@@ -77,11 +77,11 @@
 
     <div class="im_history_col_wrap" ng-controller="AppImHistoryController" ng-class="{im_history_loaded: state.loaded}">
 
-      <div ng-show="!state.notSelected &amp;&amp; !state.loaded" class="im_history_not_selected" my-vertical-position="0.35" padding="true">
+      <div class="im_history_not_selected_wrap im_history_not_selected" my-vertical-position="0.35" padding="true">
         <my-i18n msgid="im_loading_history"></my-i18n><span my-loading-dots></span>
       </div>
 
-      <div ng-show="!state.notSelected &amp;&amp; state.loaded">
+      <div class="im_history_selected_wrap">
         <div my-history-mobile class="im_history_col">
 
           <div class="im_history_wrap im_history_scrollable_wrap mobile_scrollable_wrap">