').text($scope.draftMessage.text || '').html();
- html = html.replace(/\n/g, '
');
- $(richTextarea).html(html);
- lastLength = html.length;
- updateHeight();
- }
}
function updateValue () {
if (richTextarea) {
- $(richTextarea).trigger('change');
+ composer.onChange();
updateHeight();
}
}
- var height = richTextarea.offsetHeight;
+ var height = richTextarea && richTextarea.offsetHeight;
function updateHeight () {
var newHeight = richTextarea.offsetHeight;
if (height != newHeight) {
@@ -1250,7 +1182,7 @@ angular.module('myApp.directives', ['myApp.filters'])
function onKeyDown(e) {
if (e.keyCode == 9 && !e.shiftKey && !e.ctrlKey && !e.metaKey && !$modalStack.getTop()) { // TAB
- editorElement.focus();
+ composer.focus();
return cancelEvent(e);
}
}
@@ -1265,13 +1197,18 @@ angular.module('myApp.directives', ['myApp.filters'])
$scope.$on('ui_history_change', focusField);
}
- $scope.$on('ui_peer_change', resetTyping);
- $scope.$on('ui_peer_draft', updateRichTextarea);
+ $scope.$on('ui_peer_change', composer.resetTyping.bind(composer));
+ $scope.$on('ui_peer_draft', function () {
+ if (richTextarea) {
+ composer.setValue($scope.draftMessage.text || '');
+ updateHeight();
+ }
+ composer.focus();
+ });
var sendAwaiting = false;
$scope.$on('ui_message_before_send', function () {
sendAwaiting = true;
- $timeout.cancel(updatePromise);
updateValue();
});
$scope.$on('ui_message_send', function () {
@@ -1279,35 +1216,17 @@ angular.module('myApp.directives', ['myApp.filters'])
focusField();
});
-
function focusField () {
onContentLoaded(function () {
- editorElement.focus();
+ composer.focus();
});
}
- function onPastedImageEvent (e) {
- var element = (e.originalEvent || e).target,
- src = (element || {}).src || '',
- remove = false;
-
- if (src.substr(0, 5) == 'data:') {
- remove = true;
- var blob = dataUrlToBlob(src);
- ErrorService.confirm({type: 'FILE_CLIPBOARD_PASTE'}).then(function () {
- $scope.draftMessage.files = [blob];
- $scope.draftMessage.isMedia = true;
- });
- setZeroTimeout(function () {
- element.parentNode.removeChild(element);
- })
- }
- else if (src && !src.match(/img\/blank\.gif/)) {
- var replacementNode = document.createTextNode(' ' + src + ' ');
- setTimeout(function () {
- element.parentNode.replaceChild(replacementNode, element);
- }, 100);
- }
+ function onFilesPaste (blobs) {
+ ErrorService.confirm({type: 'FILE_CLIPBOARD_PASTE'}).then(function () {
+ $scope.draftMessage.files = blobs;
+ $scope.draftMessage.isMedia = true;
+ });
};
function onPasteEvent (e) {
@@ -1348,7 +1267,7 @@ angular.module('myApp.directives', ['myApp.filters'])
if (e.type == 'dragenter' || e.type == 'dragover') {
if (dragStateChanged) {
$(dropbox)
- .css({height: editorElement.offsetHeight + 2, width: editorElement.offsetWidth})
+ .css({height: messageFieldWrap.offsetHeight + 2, width: messageFieldWrap.offsetWidth})
.show();
}
} else {
@@ -1371,15 +1290,11 @@ angular.module('myApp.directives', ['myApp.filters'])
$scope.$on('$destroy', function cleanup() {
- $('body').off('dragenter dragleave dragover drop', onDragDropEvent);
$(document).off('paste', onPasteEvent);
$(document).off('keydown', onKeyDown);
- $(submitBtn).off('mousedown')
+ $('body').off('dragenter dragleave dragover drop', onDragDropEvent);
+ $(submitBtn).off('mousedown touchstart');
fileSelects.off('change');
- if (richTextarea) {
- $(richTextarea).off('DOMNodeInserted keyup', onPastedImageEvent);
- }
- $(editorElement).off('keydown');
});
if (!Config.Navigator.touch) {
diff --git a/app/js/lib/utils.js b/app/js/lib/utils.js
index 77a25605..dea19f5d 100644
--- a/app/js/lib/utils.js
+++ b/app/js/lib/utils.js
@@ -112,25 +112,63 @@ function getFieldSelection (field) {
return len;
}
-function getFieldValue(field) {
+function getRichValue(field) {
if (!field) {
return '';
}
- if (field.tagName == 'INPUT' || field.tagName == 'TEXTAREA') {
- return field.value;
- }
var lines = [];
var line = [];
- getFieldElementValue(field, lines, line);
+
+ getRichElementValue(field, lines, line);
if (line.length) {
lines.push(line.join(''));
}
+
return lines.join('\n');
}
-function getFieldElementValue(node, lines, line) {
+function getRichValueWithCaret(field) {
+ if (!field) {
+ return [];
+ }
+ var lines = [];
+ var line = [];
+
+ var sel = window.getSelection ? window.getSelection() : false;
+ var selNode, selOffset;
+ if (sel && sel.rangeCount) {
+ var range = sel.getRangeAt(0);
+ if (range.startContainer &&
+ range.startContainer == range.endContainer &&
+ range.startOffset == range.endOffset) {
+ selNode = range.startContainer;
+ selOffset = range.startOffset;
+ }
+ }
+
+ getRichElementValue(field, lines, line, selNode, selOffset);
+
+ if (line.length) {
+ lines.push(line.join(''));
+ }
+
+ var value = lines.join('\n');
+ var caretPos = value.indexOf('\001');
+ if (caretPos != -1) {
+ value = value.substr(0, caretPos) + value.substr(caretPos + 1);
+ }
+
+ return [value, caretPos];
+}
+
+function getRichElementValue(node, lines, line, selNode, selOffset) {
if (node.nodeType == 3) { // TEXT
- line.push(node.nodeValue);
+ if (selNode === node) {
+ var value = node.nodeValue;
+ line.push(value.substr(0, selOffset) + '\001' + value.substr(selOffset));
+ } else {
+ line.push(node.nodeValue);
+ }
return;
}
if (node.nodeType != 1) { // NON-ELEMENT
@@ -147,9 +185,12 @@ function getFieldElementValue(node, lines, line) {
line.push(node.alt);
}
}
+ if (selNode === node) {
+ line.push('\001');
+ }
var curChild = node.firstChild;
while (curChild) {
- getFieldElementValue(curChild, lines, line);
+ getRichElementValue(curChild, lines, line, selNode, selOffset);
curChild = curChild.nextSibling;
}
if (isBlock && line.length) {
@@ -158,8 +199,31 @@ function getFieldElementValue(node, lines, line) {
}
}
+function setRichFocus(field, selectNode) {
+ field.focus();
+ if (window.getSelection && document.createRange) {
+ var range = document.createRange();
+ if (selectNode) {
+ range.selectNode(selectNode);
+ } else {
+ range.selectNodeContents(field);
+ }
+ range.collapse(false);
+
+ var sel = window.getSelection();
+ sel.removeAllRanges();
+ sel.addRange(range);
+ }
+ else if (document.body.createTextRange !== undefined) {
+ var textRange = document.body.createTextRange();
+ textRange.moveToElementText(selectNode || field);
+ textRange.collapse(false);
+ textRange.select();
+ }
+}
+
function onContentLoaded (cb) {
- setTimeout(cb, 0);
+ setZeroTimeout(cb);
}
function tsNow (seconds) {
diff --git a/app/js/message_composer.js b/app/js/message_composer.js
index bd01a19d..e1064baa 100644
--- a/app/js/message_composer.js
+++ b/app/js/message_composer.js
@@ -147,6 +147,17 @@ function EmojiTooltip (btnEl, options) {
self.onMouseLeave(true);
}
});
+ $(this.btnEl).on('mousedown', function (e) {
+ if (!self.shown) {
+ clearTimeout(self.showTimeout);
+ delete self.showTimeout;
+ self.show();
+ } else {
+ clearTimeout(self.hideTimeout);
+ delete self.hideTimeout;
+ self.hide();
+ }
+ });
}
EmojiTooltip.prototype.onMouseEnter = function (triggerShow) {
@@ -180,7 +191,7 @@ EmojiTooltip.prototype.createTooltip = function () {
}
var self = this;
- this.tooltipEl = $('
').appendTo(document.body);
+ this.tooltipEl = $('
').appendTo(document.body);
this.tabsEl = $('.composer_emoji_tooltip_tabs', this.tooltip);
this.contentEl = $('.composer_emoji_tooltip_content', this.tooltip);
@@ -278,7 +289,7 @@ EmojiTooltip.prototype.updateTabContents = function (tab) {
emoticonData = Config.Emoji[emoticonCode];
x = iconSize * (i % totalColumns);
y = iconSize * Math.floor(i / totalColumns);
- html.push('
');
+ html.push('
');
}
this.contentEl.html(html.join(''));
}
@@ -296,7 +307,7 @@ EmojiTooltip.prototype.updateTabContents = function (tab) {
pos = spritesheet[1];
x = iconSize * spritesheet[3];
y = iconSize * spritesheet[2];
- html.push('
');
+ html.push('
');
}
}
self.contentEl.html(html.join(''));
@@ -311,13 +322,17 @@ EmojiTooltip.prototype.updatePosition = function () {
EmojiTooltip.prototype.show = function () {
this.updatePosition();
- this.tooltipEl.show();
+ this.tooltipEl.addClass('composer_emoji_tooltip_shown');
+ this.btnEl.addClass('composer_emoji_insert_btn_on');
delete this.showTimeout;
+ this.shown = true;
};
EmojiTooltip.prototype.hide = function () {
- this.tooltipEl.hide();
+ this.tooltipEl.removeClass('composer_emoji_tooltip_shown');
+ this.btnEl.removeClass('composer_emoji_insert_btn_on');
delete this.hideTimeout;
+ delete this.shown;
};
@@ -381,8 +396,6 @@ function MessageComposer (textarea, options) {
this.textareaEl = $(textarea);
this.setUpInput();
- // this.textareaEl.on('keyup keydown', this.onKeyEvent.bind(this));
- // this.textareaEl.on('focus blur', this.onFocusBlur.bind(this));
this.autoCompleteEl = $('').appendTo(document.body);
@@ -395,7 +408,7 @@ function MessageComposer (textarea, options) {
}
if (code = target.attr('data-code')) {
if (self.onEmojiSelected) {
- self.onEmojiSelected(code);
+ self.onEmojiSelected(code, true);
}
EmojiHelper.pushPopularEmoji(code);
}
@@ -403,24 +416,32 @@ function MessageComposer (textarea, options) {
});
this.isActive = false;
+
+ this.onTyping = options.onTyping;
+ this.onMessageSubmit = options.onMessageSubmit;
+ this.getSendOnEnter = options.getSendOnEnter;
}
MessageComposer.prototype.setUpInput = function () {
if ('contentEditable' in document.body) {
- this.setUpContenteditable();
+ this.setUpRich();
} else {
this.setUpPlaintext();
}
}
-MessageComposer.prototype.setUpContenteditable = function () {
+MessageComposer.prototype.setUpRich = function () {
this.textareaEl.hide();
- this.contentEditableEl = $('
');
+ this.richTextareaEl = $('
');
- this.textareaEl[0].parentNode.insertBefore(this.contentEditableEl[0], this.textareaEl[0]);
+ this.textareaEl[0].parentNode.insertBefore(this.richTextareaEl[0], this.textareaEl[0]);
- this.contentEditableEl.on('keyup keydown', this.onKeyEvent.bind(this));
- this.contentEditableEl.on('focus blur', this.onFocusBlur.bind(this));
+ this.richTextareaEl.on('keyup keydown', this.onKeyEvent.bind(this));
+ this.richTextareaEl.on('focus blur', this.onFocusBlur.bind(this));
+ this.richTextareaEl.on('paste', this.onRichPaste.bind(this));
+ this.richTextareaEl.on('DOMNodeInserted', this.onRichPasteNode.bind(this));
+
+ $(document.body).on('keydown', this.backupSelection.bind(this));
}
MessageComposer.prototype.setUpPlaintext = function () {
@@ -432,51 +453,145 @@ MessageComposer.prototype.onKeyEvent = function (e) {
var self = this;
if (e.type == 'keyup') {
this.checkAutocomplete();
- }
- if (e.type == 'keydown' && this.autocompleteShown) {
- if (e.keyCode == 38 || e.keyCode == 40) { // UP / DOWN
- var next = e.keyCode == 40;
- var currentSelected = $(this.autoCompleteEl).find('.composer_emoji_option_active');
-
- if (currentSelected.length) {
- var currentSelectedWrap = currentSelected[0].parentNode;
- var nextWrap = currentSelectedWrap[next ? 'nextSibling' : 'previousSibling'];
- currentSelected.removeClass('composer_emoji_option_active');
- if (nextWrap) {
- $(nextWrap).find('a').addClass('composer_emoji_option_active');
- return cancelEvent(e);
+
+ if (this.onTyping) {
+ var now = tsNow();
+ if (now - this.lastTyping > 5000) {
+ var length = (this.richTextareaEl ? this.richTextareaEl[0].textContent : this.textareaEl[0].value).length;
+
+ if (length != this.lastLength) {
+ this.lastTyping = now;
+ this.lastLength = length;
+ this.onTyping();
}
}
+ }
+
+ if (this.richTextareaEl) {
+ clearTimeout(this.updateValueTO);
+ var now = tsNow();
+ if (this.keyupStarted === undefined) {
+ this.keyupStarted = now;
+ }
+ if (now - this.keyupStarted > 10000) {
+ this.onChange();
+ }
+ else {
+ this.updateValueTO = setTimeout(this.onChange.bind(this), 1000);
+ }
+ }
+
+ }
+ if (e.type == 'keydown') {
+ if (this.autocompleteShown) {
+ if (e.keyCode == 38 || e.keyCode == 40) { // UP / DOWN
+ var next = e.keyCode == 40;
+ var currentSelected = $(this.autoCompleteEl).find('.composer_emoji_option_active');
+
+ if (currentSelected.length) {
+ var currentSelectedWrap = currentSelected[0].parentNode;
+ var nextWrap = currentSelectedWrap[next ? 'nextSibling' : 'previousSibling'];
+ currentSelected.removeClass('composer_emoji_option_active');
+ if (nextWrap) {
+ $(nextWrap).find('a').addClass('composer_emoji_option_active');
+ return cancelEvent(e);
+ }
+ }
+
+ var childNodes = this.autoCompleteEl[0].childNodes;
+ var nextWrap = childNodes[next ? 0 : childNodes.length - 1];
+ $(nextWrap).find('a').addClass('composer_emoji_option_active');
- var childNodes = this.autoCompleteEl[0].childNodes;
- var nextWrap = childNodes[next ? 0 : childNodes.length - 1];
- $(nextWrap).find('a').addClass('composer_emoji_option_active');
+ return cancelEvent(e);
+ }
- return cancelEvent(e);
+ if (e.keyCode == 13) { // ENTER
+ var currentSelected = $(this.autoCompleteEl).find('.composer_emoji_option_active') ||
+ $(this.autoCompleteEl).childNodes[0].find('a');
+ var code = currentSelected.attr('data-code');
+ if (code) {
+ this.onEmojiSelected(code, true);
+ EmojiHelper.pushPopularEmoji(code);
+ }
+ return cancelEvent(e);
+ }
}
- if (e.keyCode == 13) { // ENTER
- var currentSelected = $(this.autoCompleteEl).find('.composer_emoji_option_active') ||
- $(this.autoCompleteEl).childNodes[0].find('a');
- var code = currentSelected.attr('data-code');
- if (code) {
- this.onEmojiSelected(code);
- EmojiHelper.pushPopularEmoji(code);
+ else if (e.keyCode == 13) {
+ var submit = false;
+ var sendOnEnter = true;
+ if (this.getSendOnEnter && !this.getSendOnEnter()) {
+ sendOnEnter = false;
+ }
+ if (sendOnEnter && !e.shiftKey) {
+ submit = true;
+ } else if (!sendOnEnter && (e.ctrlKey || e.metaKey)) {
+ submit = true;
+ }
+
+ if (submit) {
+ this.onMessageSubmit(e);
+ return cancelEvent(e);
}
- return cancelEvent(e);
}
}
}
+MessageComposer.prototype.backupSelection = function () {
+ delete this.selection;
+
+ if (!this.isActive) {
+ return;
+ }
+ if (window.getSelection) {
+ var sel = window.getSelection();
+ if (sel.getRangeAt && sel.rangeCount) {
+ this.selection = sel.getRangeAt(0);
+ }
+ } else if (document.selection && document.selection.createRange) {
+ this.selection = document.selection.createRange();
+ }
+}
+
+MessageComposer.prototype.restoreSelection = function () {
+ if (!this.selection) {
+ return false;
+ }
+ var result = false;
+ if (window.getSelection) {
+ var sel = window.getSelection();
+ sel.removeAllRanges();
+ sel.addRange(this.selection);
+ result = true;
+ }
+ else if (document.selection && this.selection.select) {
+ this.selection.select();
+ result = true;
+ }
+ delete this.selection;
+
+ return result;
+}
+
+
+
MessageComposer.prototype.checkAutocomplete = function () {
- var textarea = this.contentEditableEl ? this.contentEditableEl[0] : this.textareaEl;
- var pos = getFieldSelection(textarea);
- var value = getFieldValue(textarea).substr(0, pos);
+ var pos, value;
+ if (this.richTextareaEl) {
+ var textarea = this.richTextareaEl[0];
+ var valueCaret = getRichValueWithCaret(textarea);
+ var value = valueCaret[0];
+ var pos = valueCaret[1] >= 0 ? valueCaret[1] : value.length;
+ } else {
+ var textarea = this.textareaEl[0];
+ var pos = getFieldSelection(textarea);
+ var value = textarea.value;
+ }
- console.log(pos, value);
+ value = value.substr(0, pos);
var matches = value.match(/:([A-Za-z_0-z\+-]*)$/);
- if (matches) {
+ if (matches/* && !this.richTextareaEl*/) {
if (this.previousQuery == matches[0]) {
return;
}
@@ -509,31 +624,157 @@ MessageComposer.prototype.onFocusBlur = function (e) {
} else {
setTimeout(this.checkAutocomplete.bind(this), 100);
}
+ if (this.richTextareaEl) {
+ document.execCommand('enableObjectResizing', !this.isActive, !this.isActive);
+ }
}
-MessageComposer.prototype.onEmojiSelected = function (code) {
- console.log('emoji selected', code);
+MessageComposer.prototype.onRichPaste = function (e) {
+ var cData = (e.originalEvent || e).clipboardData,
+ items = cData && cData.items || [],
+ i;
+ for (i = 0; i < items.length; i++) {
+ if (items[i].kind == 'file') {
+ e.preventDefault();
+ return true;
+ }
+ }
- var emoji = EmojiHelper.emojis[code];
+ var text = (e.originalEvent || e).clipboardData.getData('text/plain');
+ setZeroTimeout(this.onChange.bind(this), 0);
+ if (text.length) {
+ document.execCommand('insertText', false, text);
+ return cancelEvent(e);
+ }
+ return true;
+}
- var textarea = this.textareaEl[0];
- var fullValue = textarea.value;
- var pos = this.isActive ? getFieldSelection(textarea) : fullValue.length;
- var suffix = fullValue.substr(pos);
- var prefix = fullValue.substr(0, pos);
- var matches = prefix.match(/:([A-Za-z_0-z\+-]*)$/);
+MessageComposer.prototype.onRichPasteNode = function (e) {
+ var element = (e.originalEvent || e).target,
+ src = (element || {}).src || '',
+ remove = false;
+
+ if (src.substr(0, 5) == 'data:') {
+ remove = true;
+ var blob = dataUrlToBlob(src);
+ this.onFilePaste(blob);
+ setZeroTimeout(function () {
+ element.parentNode.removeChild(element);
+ })
+ }
+ else if (src && !src.match(/img\/blank\.gif/)) {
+ var replacementNode = document.createTextNode(' ' + src + ' ');
+ setTimeout(function () {
+ element.parentNode.replaceChild(replacementNode, element);
+ }, 100);
+ }
+}
- if (matches && matches[0]) {
- var newValue = prefix.substr(0, matches.index) + ':' + emoji[1] + ': ' + suffix;
- var newPos = matches.index + emoji[1].length + 3;
- } else {
- var newValue = prefix + ':' + emoji[1] + ': ' + suffix;
- var newPos = prefix.length + emoji[1].length + 3;
+
+
+MessageComposer.prototype.onEmojiSelected = function (code, autocomplete) {
+ if (this.richTextareaEl) {
+ var textarea = this.richTextareaEl[0];
+ if (!this.isActive) {
+ if (!this.restoreSelection()) {
+ setRichFocus(textarea);
+ }
+ }
+ if (autocomplete) {
+ var valueCaret = getRichValueWithCaret(textarea);
+ var fullValue = valueCaret[0];
+ var pos = valueCaret[1] >= 0 ? valueCaret[1] : fullValue.length;
+ var suffix = fullValue.substr(pos);
+ var prefix = fullValue.substr(0, pos);
+ var matches = prefix.match(/:([A-Za-z0-9\-\+\*_]*)$/);
+ var emoji = EmojiHelper.emojis[code];
+
+ var newValuePrefix;
+ if (matches && matches[0]) {
+ newValuePrefix = prefix.substr(0, matches.index) + ':' + emoji[1] + ':';
+ } else {
+ newValuePrefix = prefix + ':' + emoji[1] + ':';
+ }
+ textarea.value = newValue;
+
+ this.selId = (this.selId || 0) + 1;
+ var html = this.getRichHtml(newValuePrefix) + '
' + this.getRichHtml(suffix);
+
+ this.richTextareaEl.html(html);
+ setRichFocus(textarea, $('#composer_sel' + this.selId)[0]);
+ } else {
+ document.execCommand('insertHTML', false, this.getEmojiHtml(code));
+ }
+ }
+ else {
+ var textarea = this.textareaEl[0];
+ var fullValue = textarea.value;
+ var pos = this.isActive ? getFieldSelection(textarea) : fullValue.length;
+ var suffix = fullValue.substr(pos);
+ var prefix = fullValue.substr(0, pos);
+ var matches = autocomplete && prefix.match(/:([A-Za-z0-9\-\+\*_]*)$/);
+ var emoji = EmojiHelper.emojis[code];
+
+ if (matches && matches[0]) {
+ var newValue = prefix.substr(0, matches.index) + ':' + emoji[1] + ': ' + suffix;
+ var newPos = matches.index + emoji[1].length + 3;
+ } else {
+ var newValue = prefix + ':' + emoji[1] + ': ' + suffix;
+ var newPos = prefix.length + emoji[1].length + 3;
+ }
+ textarea.value = newValue;
+ setFieldSelection(textarea, newPos);
}
- textarea.value = newValue;
- setFieldSelection(textarea, newPos);
this.hideSuggestions();
+ this.onChange();
+}
+
+MessageComposer.prototype.onChange = function (e) {
+ if (this.richTextareaEl) {
+ delete this.keyupStarted;
+ this.textareaEl.val(getRichValue(this.richTextareaEl[0])).trigger('change');
+ }
+}
+
+MessageComposer.prototype.getEmojiHtml = function (code, emoji) {
+ emoji = emoji || EmojiHelper.emojis[code];
+ var iconSize = 20;
+ var spritesheet = EmojiHelper.spritesheetPositions[code];
+ var categoryIndex = spritesheet[0];
+ var pos = spritesheet[1];
+ var x = iconSize * spritesheet[3];
+ var y = iconSize * spritesheet[2];
+
+ return '
![:' + encodeEntities(emoji[1]) + ':](img/blank.gif)
';
+}
+
+MessageComposer.prototype.setValue = function (text) {
+ if (this.richTextareaEl) {
+ this.richTextareaEl.html(this.getRichHtml(text));
+ this.lastLength = text.length;
+ } else {
+ this.textareaEl.val(text);
+ }
+}
+
+MessageComposer.prototype.getRichHtml = function (text) {
+ return $('
').text(text).html().replace(/:([A-Za-z0-9\-\+\*_]+?):/gi, (function (all, shortcut) {
+ var code = EmojiHelper.shortcuts[shortcut];
+ if (code !== undefined) {
+ return this.getEmojiHtml(code);
+ }
+ return all;
+ }).bind(this));
+}
+
+
+MessageComposer.prototype.focus = function () {
+ if (this.richTextareaEl) {
+ setRichFocus(this.richTextareaEl[0]);
+ } else {
+ setFieldSelection(this.textareaEl[0]);
+ }
}
@@ -567,7 +808,7 @@ MessageComposer.prototype.showEmojiSuggestions = function (codes) {
}
MessageComposer.prototype.updatePosition = function () {
- var offset = this.textareaEl.offset();
+ var offset = (this.richTextareaEl || this.textareaEl).offset();
var height = this.autoCompleteEl.outerHeight();
this.autoCompleteEl.css({top: offset.top - height, left: offset.left});
}
@@ -576,3 +817,9 @@ MessageComposer.prototype.hideSuggestions = function () {
this.autoCompleteEl.hide();
delete this.autocompleteShown;
}
+
+MessageComposer.prototype.resetTyping = function () {
+ this.lastTyping = 0;
+ this.lastLength = 0;
+}
+
diff --git a/app/partials/desktop/im.html b/app/partials/desktop/im.html
index c152e5fc..bb632a7f 100644
--- a/app/partials/desktop/im.html
+++ b/app/partials/desktop/im.html
@@ -171,13 +171,13 @@
-
diff --git a/app/partials/mobile/im.html b/app/partials/mobile/im.html
index 5bd132b6..a67e8749 100644
--- a/app/partials/mobile/im.html
+++ b/app/partials/mobile/im.html
@@ -138,9 +138,7 @@