From 23d6541d3ef31e41d18c86efc3902b6597c526a3 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Wed, 30 Sep 2015 21:13:52 +0300
Subject: [PATCH] Improved gif in history

---
 app/js/services.js                 | 12 ++++++++++--
 app/less/app.less                  | 13 +++++++------
 app/partials/desktop/full_gif.html |  6 +++---
 app/partials/desktop/im.html       | 27 +++++++++++++++++++--------
 4 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/app/js/services.js b/app/js/services.js
index 1a5180e6..7007b585 100755
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -1806,16 +1806,24 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
           width: width,
           height: height
         };
+    var dim;
 
     if (thumbPhotoSize && thumbPhotoSize._ != 'photoSizeEmpty') {
-      var dim = calcImageInBox(thumbPhotoSize.w, thumbPhotoSize.h, width, height);
+      if (isGif && doc.w && doc.h) {
+        dim = {
+          w: doc.w,
+          h: doc.h
+        };
+      } else {
+        dim = calcImageInBox(thumbPhotoSize.w, thumbPhotoSize.h, width, height);
+      }
       thumb.width = dim.w;
       thumb.height = dim.h;
       thumb.location = thumbPhotoSize.location;
       thumb.size = thumbPhotoSize.size;
     }
     else if (isSticker) {
-      var dim = calcImageInBox(doc.w, doc.h, width, height);
+      dim = calcImageInBox(doc.w, doc.h, width, height);
       thumb.width = dim.w;
       thumb.height = dim.h;
     }
diff --git a/app/less/app.less b/app/less/app.less
index 04cbaa38..dd0d313f 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -3299,15 +3299,16 @@ h5 {
 }
 
 .img_gif_thumb {
-  -webkit-filter: blur(2px);
-  -moz-filter: blur(2px);
-  -o-filter: blur(2px);
-  -ms-filter: blur(2px);
-  filter: blur(2px);
-  filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius='2');
+  -webkit-filter: blur(3px);
+  -moz-filter: blur(3px);
+  -o-filter: blur(3px);
+  -ms-filter: blur(3px);
+  filter: blur(3px);
+  filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius='3');
   margin: -1px;
   padding: 1px;
   max-width: 100%;
+  height: auto;
 }
 .img_gif_image {
   max-width: 100%;
diff --git a/app/partials/desktop/full_gif.html b/app/partials/desktop/full_gif.html
index e6476a26..5875b1da 100644
--- a/app/partials/desktop/full_gif.html
+++ b/app/partials/desktop/full_gif.html
@@ -1,9 +1,9 @@
 <a class="img_gif_with_progress_wrap" ng-click="toggle($event)">
 
-  <div class="img_gif_image_wrap" ng-switch="document.downloaded &amp;&amp; isActive">
+  <div class="img_gif_image_wrap">
 
-    <img ng-switch-when="true" class="img_gif_image" ng-src="{{document.url}}" />
-    <img ng-switch-default class="img_gif_thumb" my-load-thumb thumb="document.thumb" />
+    <img ng-if="document.url" ng-show="document.downloaded &amp;&amp; isActive" class="img_gif_image" ng-src="{{document.url}}" />
+    <img ng-hide="document.downloaded &amp;&amp; isActive" class="img_gif_thumb" my-load-thumb thumb="document.thumb" />
 
   </div>
 
diff --git a/app/partials/desktop/im.html b/app/partials/desktop/im.html
index 6355aa60..e01d4641 100644
--- a/app/partials/desktop/im.html
+++ b/app/partials/desktop/im.html
@@ -103,7 +103,7 @@
             <div class="im_history_scrollable_wrap nano-content">
 
               <div class="im_history_scrollable">
-                  <div class="im_history" ng-class="{im_history_selectable: !historyState.startBot, im_history_select_active: historyState.selectActions}">
+                  <div class="im_history" ng-class="{im_history_selectable: !historyState.botActions, im_history_select_active: historyState.selectActions}">
                     <div ng-if="state.empty"  class="im_history_empty" ng-switch="state.mayBeHasMore" my-vertical-position="0.25" padding="true">
                       <span ng-switch-when="true">
                         <my-i18n msgid="im_loading_history"></my-i18n><span my-loading-dots></span>
@@ -140,21 +140,32 @@
 
           <div class="im_bottom_panel_wrap">
 
-            <div class="im_edit_panel_wrap clearfix" ng-show="historyState.selectActions || historyState.startBot" ng-switch="historyState.startBot != false">
+            <div class="im_edit_panel_wrap clearfix" ng-show="historyState.actions()" ng-switch="historyState.actions()">
               <div class="im_edit_panel_border"></div>
-              <a ng-show="historyState.startBot != 2" class="btn btn-md btn-md-primary im_edit_cancel_link" ng-click="selectedCancel()" my-i18n="modal_cancel"></a>
-              <div class="im_edit_start_actions" ng-switch-when="true">
-                <a class="btn btn-primary im_start_btn" ng-click="botStart()" my-i18n="im_start"></a>
+
+              <div ng-switch-when="bot">
+                <a ng-show="historyState.botActions == 'param'" class="btn btn-md btn-md-primary im_edit_cancel_link" ng-click="cancelBot()" my-i18n="modal_cancel"></a>
+                <div class="im_edit_start_actions">
+                  <a class="btn btn-primary im_start_btn" ng-click="startBot()" my-i18n="im_start"></a>
+                </div>
+              </div>
+              <div ng-switch-when="channel">
+                <div class="im_edit_start_actions" ng-switch="historyState.channelActions">
+                  <a ng-switch-when="join" class="btn btn-primary im_start_btn" ng-click="joinChannel()" my-i18n="im_channel_join"></a>
+                  <a ng-switch-when="mute" class="btn btn-primary im_start_btn" ng-click="togglePeerMuted(true)" my-i18n="im_channel_mute"></a>
+                  <a ng-switch-when="unmute" class="btn btn-primary im_start_btn" ng-click="togglePeerMuted(false)" my-i18n="im_channel_unmute"></a>
+                </div>
               </div>
-              <div class="im_edit_selected_actions" ng-switch-default my-i18n>
+              <div ng-switch-when="selected" class="im_edit_selected_actions" my-i18n>
+                <a class="btn btn-md btn-md-primary im_edit_cancel_link" ng-click="selectedCancel()" my-i18n="modal_cancel"></a>
                 <a class="btn btn-primary im_edit_forward_btn" ng-click="selectedForward()" ng-class="{disabled: !selectedCount}" ng-disabled="!selectedCount" my-i18n-format="im_forward"></a>
                 <a class="btn btn-primary im_edit_delete_btn" ng-click="selectedDelete()" ng-class="{disabled: !selectedCount}" ng-disabled="!selectedCount" my-i18n-format="im_delete"></a>
-                <a class="btn btn-primary im_edit_reply_btn" ng-click="selectedReply()" ng-show="selectedCount == 1"my-i18n="im_reply"></a>
+                <a class="btn btn-primary im_edit_reply_btn" ng-click="selectedReply()" ng-show="selectedCount == 1" my-i18n="im_reply"></a>
                 <my-i18n-param name="count"><strong class="im_selected_count" ng-show="selectedCount > 0" ng-bind="selectedCount"></strong></my-i18n-param>
               </div>
             </div>
 
-            <div class="im_send_panel_wrap" ng-show="!historyState.selectActions &amp;&amp; !historyState.startBot">
+            <div class="im_send_panel_wrap" ng-show="!historyState.actions()">
 
               <div class="im_send_form_wrap1">