mirror of
https://github.com/friendica/friendica
synced 2024-11-18 03:43:40 +00:00
Merge pull request #13093 from annando/emoji-comments
The emoji selector is now available for comments
This commit is contained in:
commit
b5f2020313
4 changed files with 19 additions and 29 deletions
|
@ -101,16 +101,3 @@
|
||||||
<script>
|
<script>
|
||||||
dzFactory.setupDropzone('#dropzone-{{$id}}', 'comment-edit-text-{{$id}}');
|
dzFactory.setupDropzone('#dropzone-{{$id}}', 'comment-edit-text-{{$id}}');
|
||||||
</script>
|
</script>
|
||||||
<script>
|
|
||||||
window.onload = function(){
|
|
||||||
new EmojiPicker({
|
|
||||||
trigger: [
|
|
||||||
{
|
|
||||||
selector: '.emojis',
|
|
||||||
insertInto: '.comment-edit-text'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
closeButton: true,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
|
|
|
@ -36,6 +36,9 @@
|
||||||
<button type="button" class="btn btn-sm template-icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
|
<button type="button" class="btn btn-sm template-icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
|
||||||
<i class="fa fa-quote-left"></i>
|
<i class="fa fa-quote-left"></i>
|
||||||
</button>
|
</button>
|
||||||
|
<button type="button" class="btn btn-sm template-icon emojis" style="cursor: pointer;" aria-label="{{$edemojis}}" title="{{$edemojis}}">
|
||||||
|
<i class="fa fa-smile-o"></i>
|
||||||
|
</button>
|
||||||
</span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
<div id="dropzone-{{$id}}" class="dropzone">
|
<div id="dropzone-{{$id}}" class="dropzone">
|
||||||
|
|
|
@ -151,6 +151,19 @@
|
||||||
<script type="text/javascript" src="view/js/fancybox/jquery.fancybox.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
|
<script type="text/javascript" src="view/js/fancybox/jquery.fancybox.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
|
||||||
<script type="text/javascript" src="view/js/fancybox/fancybox.config.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
|
<script type="text/javascript" src="view/js/fancybox/fancybox.config.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
|
||||||
<script type="text/javascript" src="view/js/vanillaEmojiPicker/vanillaEmojiPicker.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
|
<script type="text/javascript" src="view/js/vanillaEmojiPicker/vanillaEmojiPicker.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
|
||||||
|
<script>
|
||||||
|
window.onload = function(){
|
||||||
|
new EmojiPicker({
|
||||||
|
trigger: [
|
||||||
|
{
|
||||||
|
selector: '.emojis',
|
||||||
|
insertInto: ['#comment-edit-text-0', '.profile-jot-text-full', '.comment-edit-text-full']
|
||||||
|
}
|
||||||
|
],
|
||||||
|
closeButton: true
|
||||||
|
});
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
{{* Include the strings which are needed for some js functions (e.g. translation)
|
{{* Include the strings which are needed for some js functions (e.g. translation)
|
||||||
They are loaded into the html <head> so that js functions can use them *}}
|
They are loaded into the html <head> so that js functions can use them *}}
|
||||||
|
|
|
@ -183,16 +183,3 @@ can load different content into the jot modal (e.g. the item edit jot)
|
||||||
<script>
|
<script>
|
||||||
dzFactory.setupDropzone('#jot-text-wrap', 'profile-jot-text');
|
dzFactory.setupDropzone('#jot-text-wrap', 'profile-jot-text');
|
||||||
</script>
|
</script>
|
||||||
<script>
|
|
||||||
window.onload = function(){
|
|
||||||
new EmojiPicker({
|
|
||||||
trigger: [
|
|
||||||
{
|
|
||||||
selector: '.emojis',
|
|
||||||
insertInto: '.profile-jot-text'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
closeButton: true,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
|
|
Loading…
Reference in a new issue