Commit 1f0ddfd5 authored by Madhur Ahuja's avatar Madhur Ahuja

Merge pull request #28 from k-zakhariy/master

Fixed bug with submitBtn selector
parents 9dd963f8 a50ba7ed
...@@ -18,6 +18,7 @@ emojiApp.directive('emojiForm', ['$timeout', '$http', '$interpolate','$compile', ...@@ -18,6 +18,7 @@ emojiApp.directive('emojiForm', ['$timeout', '$http', '$interpolate','$compile',
var messageField = $('textarea', element)[0], var messageField = $('textarea', element)[0],
fileSelects = $('input', element), fileSelects = $('input', element),
emojiButton = $('#emojibtn', element)[0], emojiButton = $('#emojibtn', element)[0],
submitBtn = $('#submitBtn', element)[0],
editorElement = messageField, editorElement = messageField,
emojiArea = $(messageField).emojiarea( emojiArea = $(messageField).emojiarea(
{ {
...@@ -126,7 +127,7 @@ emojiApp.directive('emojiForm', ['$timeout', '$http', '$interpolate','$compile', ...@@ -126,7 +127,7 @@ emojiApp.directive('emojiForm', ['$timeout', '$http', '$interpolate','$compile',
$scope.draftMessage.text || '').html(); $scope.draftMessage.text || '').html();
html = html.replace(/\n/g, '<br/>'); html = html.replace(/\n/g, '<br/>');
$(richTextarea).html(html); $(richTextarea).html(html);
lastLength = html.length; var lastLength = html.length;
updateHeight(); updateHeight();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment