From dd660750895a10b7a295cd550c52c1c07715079d Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Fri, 11 Aug 2017 21:19:07 +0200
Subject: [PATCH] Bugfixes

---
 app/js/directives.js                |  3 +--
 app/js/locales/en-us.json           |  1 +
 app/js/message_composer.js          |  1 -
 app/less/app.less                   | 10 +++++++++-
 app/less/desktop.less               |  2 +-
 app/less/mobile.less                |  2 +-
 app/partials/desktop/send_form.html | 12 ++++++++----
 app/partials/mobile/send_form.html  | 12 ++++++++----
 8 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/app/js/directives.js b/app/js/directives.js
index 5969c132..7e172a5a 100755
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -1771,7 +1771,7 @@ angular.module('myApp.directives', ['myApp.filters'])
                         touch.pageY <= curBoundaries.top + curBoundaries.height
 
           if (curHover != isHover) {
-            console.warn(dT(), 'change hover', isHover)
+            // console.warn(dT(), 'change hover', isHover)
             element.toggleClass('im_send_form_hover', isHover)
             curHover = isHover
           }
@@ -1791,7 +1791,6 @@ angular.module('myApp.directives', ['myApp.filters'])
         $($window).on(voiceRecordEvents.move, updateVoiceHoveredClass)
 
         $($window).one(voiceRecordEvents.stop, function(event) {
-          console.warn(111)
           $($window).off(voiceRecordEvents.move, updateVoiceHoveredClass)
 
           var isHover = updateVoiceHoveredClass(event, true)
diff --git a/app/js/locales/en-us.json b/app/js/locales/en-us.json
index 516c076b..d4490696 100644
--- a/app/js/locales/en-us.json
+++ b/app/js/locales/en-us.json
@@ -531,6 +531,7 @@
 	"im_submit_edit_message": "Save",
 	"im_edit_message_title": "Edit message",
   "im_voice_recording_label": "Release outside this form to cancel",
+  "im_voice_recording_cancel_label": "Release to cancel record",
   "im_voice_processing_label": "Processing{dots}",
 	"login_sign_in": "Sign in",
 	"login_enter_number_description": "Please choose your country and enter your full phone number.",
diff --git a/app/js/message_composer.js b/app/js/message_composer.js
index 777770bb..e2eaf574 100644
--- a/app/js/message_composer.js
+++ b/app/js/message_composer.js
@@ -1610,7 +1610,6 @@ MessageComposer.prototype.resetTyping = function () {
 }
 
 MessageComposer.prototype.setPlaceholder = function (newPlaceholder) {
-  console.warn(dT(), 'set placeholder', this.richTextareaEl)
   ;(this.richTextareaEl || this.textareaEl).attr('placeholder', newPlaceholder)
 }
 
diff --git a/app/less/app.less b/app/less/app.less
index dfe7e53c..ef5b13c6 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -3559,11 +3559,19 @@ li.inline_result_sticker.composer_autocomplete_option_active a {
   i {
     margin-right: 5px;
   }
-
+  
   .im_send_form_hover & {
     color: #CCC;
   }
 }
+.im_send_form_hover .im_recorder_label_hout,
+.im_recorder_label_hover {
+  display: none;
+}
+.im_send_form_hover .im_recorder_label_hover {
+  display: inline;
+
+}
 
 .im_voice_recording,
 .im_processing_recording {
diff --git a/app/less/desktop.less b/app/less/desktop.less
index f4b8f1cd..d810f928 100644
--- a/app/less/desktop.less
+++ b/app/less/desktop.less
@@ -1311,7 +1311,7 @@ a.im_panel_peer_photo .peer_initials {
   }
 }
 .im_send_form_hover .im_voice_recording .im_record {
-  background: #bfd9ed;
+  background: #cae9ff;
 }
 
 .icon-mic {
diff --git a/app/less/mobile.less b/app/less/mobile.less
index 8393aa4f..0ad3b770 100644
--- a/app/less/mobile.less
+++ b/app/less/mobile.less
@@ -1493,7 +1493,7 @@ a.im_message_fwd_author {
   }
 }
 .im_send_form_hover .im_voice_recording .im_record {
-  background: #bfd9ed;
+  background: #cae9ff;
 }
 
 .im_send_form_empty .im_submit {
diff --git a/app/partials/desktop/send_form.html b/app/partials/desktop/send_form.html
index 208e8bfa..7bebf14d 100644
--- a/app/partials/desktop/send_form.html
+++ b/app/partials/desktop/send_form.html
@@ -24,10 +24,14 @@
     <div class="im_voice_recorder_wrap">
       <div class="im_recorder_indicator"><i></i></div>
       <div class="im_recorder_time" ng-bind="voiceRecorder.duration | duration"></div>
-      <div class="im_recorder_label" ng-switch="voiceRecorder.processing" my-i18n>
-        <span ng-switch-when="true" my-i18n-format="im_voice_processing_label"></span>
-        <span ng-switch-default my-i18n-format="im_voice_recording_label"></span>
-        <my-i18n-param name="dots"></my-i18n-param>
+      <div class="im_recorder_label" ng-switch="voiceRecorder.processing">
+        <span ng-switch-when="true" my-i18n="im_voice_processing_label">
+          <my-i18n-param name="dots"></my-i18n-param>
+        </span>
+        <span ng-switch-default>
+          <span class="im_recorder_label_hover" my-i18n="im_voice_recording_label"></span>
+          <span class="im_recorder_label_hout" my-i18n="im_voice_recording_cancel_label"></span>
+        </span>
       </div>
     </div>
 
diff --git a/app/partials/mobile/send_form.html b/app/partials/mobile/send_form.html
index 1bbb6891..bdc4eaa1 100644
--- a/app/partials/mobile/send_form.html
+++ b/app/partials/mobile/send_form.html
@@ -15,10 +15,14 @@
     <div class="im_voice_recorder_wrap">
       <div class="im_recorder_indicator"><i></i></div>
       <div class="im_recorder_time" ng-bind="voiceRecorder.duration | duration"></div>
-      <div class="im_recorder_label" ng-switch="voiceRecorder.processing" my-i18n>
-        <span ng-switch-when="true" my-i18n-format="im_voice_processing_label"></span>
-        <span ng-switch-default my-i18n-format="im_voice_recording_label"></span>
-        <my-i18n-param name="dots"></my-i18n-param>
+      <div class="im_recorder_label" ng-switch="voiceRecorder.processing">
+        <span ng-switch-when="true" my-i18n="im_voice_processing_label">
+          <my-i18n-param name="dots"></my-i18n-param>
+        </span>
+        <span ng-switch-default>
+          <span class="im_recorder_label_hover" my-i18n="im_voice_recording_label"></span>
+          <span class="im_recorder_label_hout" my-i18n="im_voice_recording_cancel_label"></span>
+        </span>
       </div>
     </div>