Skip to content

Commit

Permalink
Merge pull request #109 from naevtamarkus/master
Browse files Browse the repository at this point in the history
Added capability to set editor's ID
  • Loading branch information
marifuli committed Nov 7, 2022
2 parents b9dd88e + 374c26c commit 0a3ad2f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/js/jquery.emojiarea.js
Expand Up @@ -353,6 +353,7 @@
'data-type': 'input',
'placeholder': $textarea.attr('placeholder'),
'contenteditable': 'true',
'id': $textarea.attr('data-emoji-id'),
});

/*
Expand Down Expand Up @@ -414,7 +415,7 @@
editorDiv.scrollTop(editorDiv[0].scrollHeight);
});

$textarea.after("<i class='emoji-picker-icon emoji-picker " + this.options.popupButtonClasses + "' data-id='" + id + "' data-type='picker'></i>");
$textarea.after("<p class='emoji-picker-icon emoji-picker " + (this.options.popupButtonClasses || "") + "' data-id='" + id + "' data-type='picker'>" + (this.options.popupButtonContent || "") + "</p>");

$textarea.hide().after(this.$editor);
this.setup();
Expand Down

0 comments on commit 0a3ad2f

Please sign in to comment.