From 6e27162ed1c6939d809fc97bc25bb227bbb729a7 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Mon, 18 Apr 2016 02:02:39 +0300
Subject: [PATCH] Bugfixes

---
 app/js/directives.js       | 6 +-----
 app/js/messages_manager.js | 4 +++-
 app/less/app.less          | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/js/directives.js b/app/js/directives.js
index 50300c9a..072f7126 100755
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -276,18 +276,14 @@ angular.module('myApp.directives', ['myApp.filters'])
       }
 
       $scope.$on('message_edit', function (e, data) {
-        // var message = $scope.message;
-        // message = $scope.$parent.$eval(attrs.myMessageBody);
-        message = AppMessagesManager.wrapForHistory(message.mid);
         if (data.mid != message.mid) {
           return;
         }
-        console.log('after edit', message.dir, message);
+        // console.log(dT(), 'Directive' edit', message);
         updateMessageText($scope, element, message);
         updateMessageMedia($scope, element, message);
         updateMessageKeyboard($scope, element, message);
         $scope.$emit('ui_height');
-        message.dir = true;
       });
     }
   })
diff --git a/app/js/messages_manager.js b/app/js/messages_manager.js
index 67454aaf..5e190251 100644
--- a/app/js/messages_manager.js
+++ b/app/js/messages_manager.js
@@ -2798,7 +2798,9 @@ angular.module('myApp.services')
         var wasForHistory = messagesForHistory[mid];
         if (wasForHistory !== undefined) {
           delete messagesForHistory[mid];
-          safeReplaceObject(wasForHistory, wrapForHistory(mid));
+          var newForHistory = wrapForHistory(mid);
+          safeReplaceObject(wasForHistory, newForHistory);
+          messagesForHistory[mid] = wasForHistory;
         }
         $rootScope.$broadcast('message_edit', {
           peerID: peerID,
diff --git a/app/less/app.less b/app/less/app.less
index 7f73b934..4db3b6a7 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -1778,6 +1778,7 @@ div.im_message_video_thumb {
 
 .im_history_select_active {
   a,
+  button,
   .clickable {
     pointer-events: none;
   }