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

Fixed send inline sticker

Browse Source
This commit is contained in:
Igor Zhukov 2016-04-20 21:03:27 +03:00
parent 6b9e9c06a4
commit e08ae04e47
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/js/message_composer.js
View File

@ -744,10 +744,15 @@ MessageComposer.prototype.setUpAutoComplete = function () {
var self = this; var self = this;
this.autoCompleteEl.on('mousedown', function (e) { this.autoCompleteEl.on('mousedown', function (e) {
e = e.originalEvent || e; e = e.originalEvent || e;
var target = $(e.target), mention, code, command, inlineID; var target = e.target;
if (target[0].tagName != 'A') { var mention, code, command, inlineID;
target = $(target[0].parentNode); while (target && target.tagName != 'A') {
target = target.parentNode;
} }
if (!target) {
return cancelEvent(e);
}
target = $(target);
if (code = target.attr('data-code')) { if (code = target.attr('data-code')) {
if (self.onEmojiSelected) { if (self.onEmojiSelected) {
self.onEmojiSelected(code, true); self.onEmojiSelected(code, true);

2
app/js/services.js
View File

@ -1983,7 +1983,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
$timeout(function () { $timeout(function () {
delete historyDoc.progress; delete historyDoc.progress;
}); });
console.log('file save done'); // console.log('file save done');
}, function (e) { }, function (e) {
console.log('document download failed', e); console.log('document download failed', e);
historyDoc.progress.enabled = false; historyDoc.progress.enabled = false;