Browse Source

Minor bugfixes

master
Igor Zhukov 11 years ago
parent
commit
2dc7d48aed
  1. 7
      app/css/app.css
  2. 4
      app/js/controllers.js
  3. 4
      app/js/directives.js

7
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_chat_from_wrap,
.active a.im_dialog .im_dialog_message_media, .active a.im_dialog .im_dialog_message_media,
.active a.im_dialog .im_dialog_message_service, .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; color: #FFF;
} }
.im_dialog_photo { .im_dialog_photo {
@ -1278,6 +1279,10 @@ a.im_dialog_selected .im_dialog_date {
.im_history_scrollable_wrap { .im_history_scrollable_wrap {
outline: none ! important; outline: none ! important;
-webkit-user-select: text; -webkit-user-select: text;
-webkit-transform: translateZ(0);
-webkit-perspective: 1000;
-webkit-backface-visibility: hidden;
} }
.im_history_to_bottom .im_history_scrollable { .im_history_to_bottom .im_history_scrollable {

4
app/js/controllers.js

@ -724,7 +724,7 @@ angular.module('myApp.controllers', [])
}); });
if (preload) { if (preload) {
$scope.historyState.typing.splice(); $scope.historyState.typing.splice(0, $scope.historyState.typing.length);
$scope.$broadcast('ui_peer_change'); $scope.$broadcast('ui_peer_change');
$scope.$broadcast('ui_history_change'); $scope.$broadcast('ui_history_change');
safeReplaceObject($scope.state, {loaded: true}); safeReplaceObject($scope.state, {loaded: true});
@ -1043,7 +1043,7 @@ angular.module('myApp.controllers', [])
// console.trace(); // console.trace();
$scope.history.push(AppMessagesManager.wrapForHistory(addedMessage.messageID)); $scope.history.push(AppMessagesManager.wrapForHistory(addedMessage.messageID));
AppMessagesManager.regroupWrappedHistory($scope.history, -3); 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}); $scope.$broadcast('ui_history_append_new', {my: addedMessage.my});
if (addedMessage.my) { if (addedMessage.my) {
delete $scope.historyUnreadAfter; delete $scope.historyUnreadAfter;

4
app/js/directives.js

@ -764,6 +764,8 @@ angular.module('myApp.directives', ['myApp.filters'])
} }
if (submit) { if (submit) {
$timeout.cancel(updatePromise);
updateValue();
$(element).trigger('submit'); $(element).trigger('submit');
$(element).trigger('message_send'); $(element).trigger('message_send');
resetAfterSubmit(); resetAfterSubmit();
@ -774,6 +776,8 @@ angular.module('myApp.directives', ['myApp.filters'])
}); });
$(submitBtn).on('mousedown touchstart', function (e) { $(submitBtn).on('mousedown touchstart', function (e) {
$timeout.cancel(updatePromise);
updateValue();
$(element).trigger('submit'); $(element).trigger('submit');
$(element).trigger('message_send'); $(element).trigger('message_send');
resetAfterSubmit(); resetAfterSubmit();

Loading…
Cancel
Save