clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '2023.09-rc' into flip-replyto-link

This commit is contained in:
Jakobus Schürz 2023-10-11 14:23:13 +02:00
parent 9898e5483a 4ce3b27e65
commit de28a375c8
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
view/lang/C/messages.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2023.09-rc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-10-11 02:08+0200\n"
"POT-Creation-Date: 2023-10-11 14:20+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
view/templates/item/compose.tpl
View File

@ -54,7 +54,7 @@
</p>
<div id="dropzone-{{$id}}" class="dropzone" style="overflow:scroll">
<p>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text form-control text-autosize" name="body" placeholder="{{$l10n.default}}" rows="7" tabindex="3" dir="auto" dir="auto">{{$body}}</textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text form-control text-autosize" name="body" placeholder="{{$l10n.default}}" rows="7" tabindex="3" dir="auto" dir="auto" onkeydown="sendOnCtrlEnter(event, 'comment-edit-submit-{{$id}}')">{{$body}}</textarea>
</p>
</div>
<p class="comment-edit-submit-wrapper">

10
view/theme/frio/js/theme.js
View File

@ -956,4 +956,14 @@ function toggleDropdownText(elm) {
function hasClass(elem, cls) {
return (" " + elem.className + " ").indexOf(" " + cls + " ") > -1;
}
// Send on <CTRL>+<Enter> or <META>+<Enter> on macos
// e: event
// submit: the id of the submitbutton
function sendOnCtrlEnter(e, submit) {
if ((e.ctrlKey || e.metaKey) && (e.keyCode == 13 || e.keyCode == 10)) {
console.log("Ctrl + Enter");
$("#" + submit).trigger('click');
}
}
// @license-end

2
view/theme/frio/templates/comment_item.tpl
View File

@ -46,7 +46,7 @@
</p>
<div id="dropzone-{{$id}}" class="dropzone">
<p>
<textarea id="comment-edit-text-{{$id}}" class="dropzone comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" rows="3" data-default="{{$default}}" dir="auto">{{$default}}</textarea>
<textarea id="comment-edit-text-{{$id}}" class="dropzone comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" rows="3" data-default="{{$default}}" dir="auto" onkeydown="sendOnCtrlEnter(event, 'comment-edit-submit-{{$id}}')">{{$default}}</textarea>
</p>
</div>
{{if $qcomment}}

4
view/theme/frio/templates/jot.tpl
View File

@ -100,7 +100,7 @@
{{* The jot text field in which the post text is inserted *}}
<div id="jot-text-wrap" class="dropzone">
<textarea rows="2" cols="64" class="profile-jot-text form-control text-autosize" id="profile-jot-text" name="body" placeholder="{{$share}}" onFocus="jotTextOpenUI(this);" onBlur="jotTextCloseUI(this);" style="min-width:100%; max-width:100%;" dir="auto">{{if $content}}{{$content nofilter}}{{/if}}</textarea>
<textarea rows="2" cols="64" class="profile-jot-text form-control text-autosize" id="profile-jot-text" name="body" placeholder="{{$share}}" onFocus="jotTextOpenUI(this);" onBlur="jotTextCloseUI(this);" style="min-width:100%; max-width:100%;" dir="auto" onkeydown="sendOnCtrlEnter(event, 'profile-jot-submit')">{{if $content}}{{$content nofilter}}{{/if}}</textarea>
</div>
<ul id="profile-jot-submit-wrapper" class="jothidden nav nav-pills">
@ -183,4 +183,4 @@ can load different content into the jot modal (e.g. the item edit jot)
<script>
dzFactory.setupDropzone('#jot-text-wrap', 'profile-jot-text');
</script>
</script>

2
view/theme/frio/templates/prv_message.tpl
View File

@ -19,7 +19,7 @@
{{* The message input field which contains the message text *}}
<div id="prvmail-message-label" class="form-group">
<label for="comment-edit-text-input">{{$yourmessage}}</label>
<textarea rows="8" cols="72" class="prvmail-text form-control text-autosize" id="comment-edit-text-input" name="body" tabindex="12" dir="auto">{{$text}}</textarea>
<textarea rows="8" cols="72" class="prvmail-text form-control text-autosize" id="comment-edit-text-input" name="body" tabindex="12" dir="auto" onkeydown="sendOnCtrlEnter(event, 'prvmail-submit')">{{$text}}</textarea>
</div>
<ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">