Browse Source

Fixed send inline sticker

master
Igor Zhukov 9 years ago
parent
commit
e08ae04e47
  1. 11
      app/js/message_composer.js
  2. 2
      app/js/services.js

11
app/js/message_composer.js

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

2
app/js/services.js

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

Loading…
Cancel
Save