keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13528 from xundeenergie/send-with-ctrlenter

Browse source 
send on ctrl+enter - resolves #13039
This commit is contained in:
Tobias Diekershoff 2023-10-11 06:52:12 +02:00 committed by GitHub
commit ee6061d3dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 43 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
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-08 07:41+0000\n"
"POT-Creation-Date: 2023-10-11 04:07+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"
@ -2420,17 +2420,12 @@ msgstr[1] ""
msgid "More Trending Tags"
msgstr ""
#: src/Content/Widget/VCard.php:105 src/Model/Contact.php:1204
#: src/Content/Widget/VCard.php:107 src/Model/Contact.php:1204
#: src/Model/Profile.php:457
msgid "Post to group"
msgstr ""
#: src/Content/Widget/VCard.php:107 src/Model/Contact.php:1206
#: src/Model/Profile.php:459
msgid "View group"
msgstr ""
#: src/Content/Widget/VCard.php:110 src/Model/Contact.php:1209
#: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1209
#: src/Model/Profile.php:462 src/Module/Moderation/Item/Source.php:85
msgid "Mention"
msgstr ""
@ -2464,6 +2459,11 @@ msgstr ""
msgid "Unfollow"
msgstr ""
#: src/Content/Widget/VCard.php:136 src/Model/Contact.php:1206
#: src/Model/Profile.php:459
msgid "View group"
msgstr ""
#: src/Core/ACL.php:166 src/Module/Profile/Profile.php:269
msgid "Yourself"
msgstr ""
@ -2724,8 +2724,8 @@ msgstr ""
#: src/Core/Installer.php:511
msgid ""
"The web installer needs to be able to create a file called \"local.config.php"
"\" in the \"config\" folder of your web server and it is unable to do so."
"The web installer needs to be able to create a file called \"local.config."
"php\" in the \"config\" folder of your web server and it is unable to do so."
msgstr ""
#: src/Core/Installer.php:512
@ -5351,9 +5351,9 @@ msgstr ""
#: src/Module/Admin/Summary.php:98
msgid ""
"The last update failed. Please run \"php bin/console.php dbstructure update"
"\" from the command line and have a look at the errors that might appear. "
"(Some of the errors are possibly inside the logfile.)"
"The last update failed. Please run \"php bin/console.php dbstructure "
"update\" from the command line and have a look at the errors that might "
"appear. (Some of the errors are possibly inside the logfile.)"
msgstr ""
#: src/Module/Admin/Summary.php:102
@ -5504,8 +5504,8 @@ msgstr ""
#, php-format
msgid ""
"Show some informations regarding the needed information to operate the node "
"according e.g. to <a href=\"%s\" target=\"_blank\" rel=\"noopener noreferrer"
"\">EU-GDPR</a>."
"according e.g. to <a href=\"%s\" target=\"_blank\" rel=\"noopener "
"noreferrer\">EU-GDPR</a>."
msgstr ""
#: src/Module/Admin/Tos.php:81
@ -8856,8 +8856,8 @@ msgstr ""
#: src/Module/Profile/Profile.php:158
#, php-format
msgid ""
"You're currently viewing your profile as <b>%s</b> <a href=\"%s\" class="
"\"btn btn-sm pull-right\">Cancel</a>"
"You're currently viewing your profile as <b>%s</b> <a href=\"%s\" "
"class=\"btn btn-sm pull-right\">Cancel</a>"
msgstr ""
#: src/Module/Profile/Profile.php:167
@ -9405,8 +9405,8 @@ msgstr ""
#: src/Module/Security/TwoFactor/Verify.php:100
#, php-format
msgid ""
"If you do not have access to your authentication code you can use a <a href="
"\"%s\">two-factor recovery code</a>."
"If you do not have access to your authentication code you can use a <a "
"href=\"%s\">two-factor recovery code</a>."
msgstr ""
#: src/Module/Security/TwoFactor/Verify.php:101
@ -11047,8 +11047,8 @@ msgstr ""
#: src/Module/Settings/TwoFactor/Verify.php:149
#, php-format
msgid ""
"<p>Or you can open the following URL in your mobile device:</p><p><a href="
"\"%s\">%s</a></p>"
"<p>Or you can open the following URL in your mobile device:</p><p><a "
"href=\"%s\">%s</a></p>"
msgstr ""
#: src/Module/Settings/TwoFactor/Verify.php:156
@ -11157,9 +11157,9 @@ msgstr ""
msgid ""
"At any point in time a logged in user can export their account data from the "
"<a href=\"%1$s/settings/userexport\">account settings</a>. If the user wants "
"to delete their account they can do so at <a href=\"%1$s/settings/removeme\">"
"%1$s/settings/removeme</a>. The deletion of the account will be permanent. "
"Deletion of the data will also be requested from the nodes of the "
"to delete their account they can do so at <a href=\"%1$s/settings/"
"removeme\">%1$s/settings/removeme</a>. The deletion of the account will be "
"permanent. Deletion of the data will also be requested from the nodes of the "
"communication partners."
msgstr ""

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">

5
view/theme/frio/js/textedit.js
View file

@ -106,6 +106,11 @@ function commentExpand(id) {
closeMenu("comment-fake-form-" + id);
openMenu("item-comments-" + id);
$("#comment-edit-text-" + id)
.keydown(function (e) {
if ((e.ctrlKey || e.metaKey) && (e.keyCode == 13 || e.keyCode == 10)) {
$("#comment-edit-submit-" + id).trigger('click');
}
})
.putCursorAtEnd()
.addClass("comment-edit-text-full")
.removeClass("comment-edit-text-empty");

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

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">