Merge branch 'KoboldAI:main' into united

This commit is contained in:
henk717 2021-09-30 18:33:02 +02:00 committed by GitHub
commit e9ff779dc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -495,8 +495,7 @@ function returnWiList(ar) {
function dosubmit() {
var txt = input_text.val().replace(/\u00a0/g, " ");
console.log(gamestarted)
if(!gamestarted && ((!adventure || !action_mode) && txt.trim().length == 0)) {
if(!memorymode && !gamestarted && ((!adventure || !action_mode) && txt.trim().length == 0)) {
return;
}
socket.send({'cmd': 'submit', 'actionmode': adventure ? action_mode : 0, 'data': txt});

View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="static/jquery-3.6.0.min.js"></script>
<script src="static/socket.io.min.js"></script>
<script src="static/application.js?ver=1.16.2a"></script>
<script src="static/application.js?ver=1.16.2b"></script>
<script src="static/bootstrap.min.js"></script>
<script src="static/bootstrap-toggle.min.js"></script>
<script src="static/rangy-core.min.js"></script>