Merge branch 'develop' into 'japanese'

ctrl+enter適用

See merge request harukin/core!13
This commit is contained in:
harukin 2018-11-10 21:34:03 +09:00
commit 04e220cc4b
2 changed files with 2 additions and 2 deletions

View File

@ -21,7 +21,7 @@
{{$anon_extras}}
</div>
{{/if}}
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text" placeholder="{{$comment}}" name="body" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" ></textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text" placeholder="{{$comment}}" name="body" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onkeydown="if(event.ctrlKey&&event.keyCode==13){document.getElementById('comment-edit-submit-{{$id}}').click();return false};"></textarea>
<div id="comment-tools-{{$id}}" class="pt-2 comment-tools">
<div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left">
<div class="btn-group mr-2">

View File

@ -52,7 +52,7 @@
</button>
{{/if}}
</div>
<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" >{{$content}}</textarea>
<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" onkeydown="if(event.ctrlKey&&event.keyCode==13){document.getElementById('dbtn-submit').click();return false};" >{{$content}}</textarea>
</div>
{{if $attachment}}
<div id="jot-attachment-wrap">