rixty
/
KoboldAI-Client
mirror of https://github.com/KoboldAI/KoboldAI-Client.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'KoboldAI:main' into united

This commit is contained in:
henk717 2021-10-03 04:32:20 +02:00 committed by GitHub
parent 4451edc7a2 6d30d30b39
commit 6152d390c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
static/application.js
View File

@ -79,7 +79,7 @@ var sman_allow_delete = false;
var sman_allow_rename = false; var sman_allow_rename = false;
// This is true iff [we're in macOS and the browser is Safari] or [we're in iOS] // This is true iff [we're in macOS and the browser is Safari] or [we're in iOS]
var using_webkit_patch = null; var using_webkit_patch = true;
// Key states // Key states
var shift_down = false; var shift_down = false;
@ -1132,9 +1132,7 @@ $(document).ready(function(){
// A simple feature detection test to determine whether the user interface // A simple feature detection test to determine whether the user interface
// is using WebKit (Safari browser's rendering engine) because WebKit // is using WebKit (Safari browser's rendering engine) because WebKit
// requires special treatment to work correctly with the KoboldAI editor // requires special treatment to work correctly with the KoboldAI editor
if(using_webkit_patch === null) { (function() {
using_webkit_patch = (function() {
try {
var active_element = document.activeElement; var active_element = document.activeElement;
var c = document.createElement("chunk"); var c = document.createElement("chunk");
var t = document.createTextNode("KoboldAI"); var t = document.createTextNode("KoboldAI");
@ -1148,17 +1146,12 @@ $(document).ready(function(){
s.addRange(r); s.addRange(r);
game_text.blur(); game_text.blur();
game_text.focus(); game_text.focus();
var offset = rangy.getSelection().focusOffset; using_webkit_patch = rangy.getSelection().focusOffset !== 6;
c.removeChild(t); c.removeChild(t);
game_text[0].removeChild(c); game_text[0].removeChild(c);
document.activeElement.blur(); document.activeElement.blur();
active_element.focus(); active_element.focus();
return offset !== 6;
} catch (e) {
return false;
}
})(); })();
}
} else if(msg.cmd == "updatescreen") { } else if(msg.cmd == "updatescreen") {
var _gamestarted = gamestarted; var _gamestarted = gamestarted;
gamestarted = msg.gamestarted; gamestarted = msg.gamestarted;

2
templates/index.html
View File

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