From 2dc7d48aedbd86e004c4c2a236fd95f0fd152eb9 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Mon, 28 Jul 2014 12:26:34 +0400 Subject: [PATCH] Minor bugfixes --- app/css/app.css | 7 ++++++- app/js/controllers.js | 4 ++-- app/js/directives.js | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/css/app.css b/app/css/app.css index 8f69c1c2..452e7830 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -1040,7 +1040,8 @@ a.im_dialog_selected .im_dialog_message_text { .active a.im_dialog .im_dialog_chat_from_wrap, .active a.im_dialog .im_dialog_message_media, .active a.im_dialog .im_dialog_message_service, -.active a.im_dialog .im_dialog_message_text { +.active a.im_dialog .im_dialog_message_text, +.active a.im_dialog .im_dialog_message { color: #FFF; } .im_dialog_photo { @@ -1278,6 +1279,10 @@ a.im_dialog_selected .im_dialog_date { .im_history_scrollable_wrap { outline: none ! important; -webkit-user-select: text; + + -webkit-transform: translateZ(0); + -webkit-perspective: 1000; + -webkit-backface-visibility: hidden; } .im_history_to_bottom .im_history_scrollable { diff --git a/app/js/controllers.js b/app/js/controllers.js index dd057d4a..57841d85 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -724,7 +724,7 @@ angular.module('myApp.controllers', []) }); if (preload) { - $scope.historyState.typing.splice(); + $scope.historyState.typing.splice(0, $scope.historyState.typing.length); $scope.$broadcast('ui_peer_change'); $scope.$broadcast('ui_history_change'); safeReplaceObject($scope.state, {loaded: true}); @@ -1043,7 +1043,7 @@ angular.module('myApp.controllers', []) // console.trace(); $scope.history.push(AppMessagesManager.wrapForHistory(addedMessage.messageID)); AppMessagesManager.regroupWrappedHistory($scope.history, -3); - $scope.historyState.typing.splice(); + $scope.historyState.typing.splice(0, $scope.historyState.typing.length); $scope.$broadcast('ui_history_append_new', {my: addedMessage.my}); if (addedMessage.my) { delete $scope.historyUnreadAfter; diff --git a/app/js/directives.js b/app/js/directives.js index cd56ba4a..c2145868 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -764,6 +764,8 @@ angular.module('myApp.directives', ['myApp.filters']) } if (submit) { + $timeout.cancel(updatePromise); + updateValue(); $(element).trigger('submit'); $(element).trigger('message_send'); resetAfterSubmit(); @@ -774,6 +776,8 @@ angular.module('myApp.directives', ['myApp.filters']) }); $(submitBtn).on('mousedown touchstart', function (e) { + $timeout.cancel(updatePromise); + updateValue(); $(element).trigger('submit'); $(element).trigger('message_send'); resetAfterSubmit();