r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed message send

Browse Source
This commit is contained in:
Igor Zhukov 2014-10-19 11:36:28 +02:00
parent dfa62f90ce
commit 607639a6a8
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/js/controllers.js
View File

@ -1377,13 +1377,10 @@ angular.module('myApp.controllers', ['myApp.i18n'])
$scope.$on('user_update', angular.noop); $scope.$on('user_update', angular.noop);
$scope.$on('ui_typing', onTyping); $scope.$on('ui_typing', onTyping);
$scope.draftMessage = {text: ''}; $scope.draftMessage = {text: '', send: sendMessage};
$scope.$watch('draftMessage.text', onMessageChange); $scope.$watch('draftMessage.text', onMessageChange);
$scope.$watch('draftMessage.files', onFilesSelected); $scope.$watch('draftMessage.files', onFilesSelected);
$scope.sendMessage = sendMessage;
function sendMessage (e) { function sendMessage (e) {
$scope.$broadcast('ui_message_before_send'); $scope.$broadcast('ui_message_before_send');

4
app/js/directives.js
View File

@ -954,7 +954,7 @@ angular.module('myApp.directives', ['myApp.filters'])
if (submit) { if (submit) {
$timeout.cancel(updatePromise); $timeout.cancel(updatePromise);
updateValue(); updateValue();
$(element).trigger('submit'); $scope.draftMessage.send();
$(element).trigger('message_send'); $(element).trigger('message_send');
resetAfterSubmit(); resetAfterSubmit();
return cancelEvent(e); return cancelEvent(e);
@ -966,7 +966,7 @@ angular.module('myApp.directives', ['myApp.filters'])
$(submitBtn).on('mousedown touchstart', function (e) { $(submitBtn).on('mousedown touchstart', function (e) {
$timeout.cancel(updatePromise); $timeout.cancel(updatePromise);
updateValue(); updateValue();
$(element).trigger('submit'); $scope.draftMessage.send();
$(element).trigger('message_send'); $(element).trigger('message_send');
resetAfterSubmit(); resetAfterSubmit();
return cancelEvent(e); return cancelEvent(e);