rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

Browse Source
This commit is contained in:
Cohee
2023-06-27 20:48:14 +03:00
parent 10e87dd5ca 5db69d1ce0
commit f5ba78be81
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/index.html
View File

@@ -2034,7 +2034,7 @@
<span data-i18n="Bubbles">Bubbles</span> <span data-i18n="Bubbles">Bubbles</span>
</label> </label>
</div> </div>
<div> <div id="sheldWidthToggleBlock">
<span data-i18n="Chat Width (PC):">Chat Width (PC):</span><br> <span data-i18n="Chat Width (PC):">Chat Width (PC):</span><br>
<label> <label>
<input name="sheld_width" type="radio" value="0" /> <input name="sheld_width" type="radio" value="0" />
@@ -2093,7 +2093,7 @@
<span data-i18n="Characters Hotswap">Characters Hotswap</span> <span data-i18n="Characters Hotswap">Characters Hotswap</span>
</label> </label>
<label for="movingUImode" class="checkbox_label"> <label id="movingUIModeCheckBlock" for="movingUImode" class="checkbox_label">
<input id="movingUImode" type="checkbox" /> <input id="movingUImode" type="checkbox" />
<span data-i18n="Movable UI Panels">Movable UI Panels</span> <span data-i18n="Movable UI Panels">Movable UI Panels</span>
</label> </label>

9
public/script.js
View File

@@ -6327,7 +6327,13 @@ const isPwaMode = window.navigator.standalone;
if (isPwaMode) { $("body").addClass('PWA') } if (isPwaMode) { $("body").addClass('PWA') }
$(document).ready(function () { $(document).ready(function () {
//////////INPUT BAR FOCUS-KEEPING LOGIC/////////////
if (isMobile() === true) {
console.debug('hiding movingUI and sheldWidth toggles for mobile')
$("#sheldWidthToggleBlock").hide();
$("#movingUIModeCheckBlock").hide();
}
registerSlashCommand('dupe', DupeChar, [], "– duplicates the currently selected character", true, true); registerSlashCommand('dupe', DupeChar, [], "– duplicates the currently selected character", true, true);
registerSlashCommand('api', connectAPISlash, [], "– connect to an API", true, true); registerSlashCommand('api', connectAPISlash, [], "– connect to an API", true, true);
@@ -6346,6 +6352,7 @@ $(document).ready(function () {
scrollLock = true; scrollLock = true;
}); });
//////////INPUT BAR FOCUS-KEEPING LOGIC/////////////
let S_TAFocused = false; let S_TAFocused = false;
let S_TAPreviouslyFocused = false; let S_TAPreviouslyFocused = false;
$('#send_textarea').on('focusin focus click', () => { $('#send_textarea').on('focusin focus click', () => {

14
public/scripts/RossAscends-mods.js
View File

@@ -630,13 +630,13 @@ $("document").ready(function () {
// initial status check // initial status check
setTimeout(() => { setTimeout(() => {
if (isMobile === false) {
dragElement($("#sheld")); dragElement($("#sheld"));
dragElement($("#left-nav-panel")); dragElement($("#left-nav-panel"));
dragElement($("#right-nav-panel")); dragElement($("#right-nav-panel"));
dragElement($("#WorldInfo")); dragElement($("#WorldInfo"));
dragElement($("#floatingPrompt")); dragElement($("#floatingPrompt"));
}
RA_checkOnlineStatus RA_checkOnlineStatus
} }
, 100); , 100);

7
public/scripts/power-user.js
View File

@@ -647,7 +647,7 @@ function loadPowerUserSettings(settings, data) {
} }
function loadMovingUIState() { function loadMovingUIState() {
if (power_user.movingUIState) { if (isMobile() === false && power_user.movingUIState) {
for (var elmntName of Object.keys(power_user.movingUIState)) { for (var elmntName of Object.keys(power_user.movingUIState)) {
var elmntState = power_user.movingUIState[elmntName]; var elmntState = power_user.movingUIState[elmntName];
try { try {
@@ -662,6 +662,9 @@ function loadMovingUIState() {
console.debug(`error occurred while processing ${elmntName}: ${err}`) console.debug(`error occurred while processing ${elmntName}: ${err}`)
} }
} }
} else {
console.debug('skipping movingUI state load for mobile')
return
} }
} }
@@ -1213,7 +1216,7 @@ $(document).ready(() => {
printCharacters(); printCharacters();
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$("#play_message_sound").on('input', function () { $("#play_message_sound").on('input', function () {
power_user.play_message_sound = !!$(this).prop('checked'); power_user.play_message_sound = !!$(this).prop('checked');
saveSettingsDebounced(); saveSettingsDebounced();

5
public/style.css
View File

@@ -4719,12 +4719,17 @@ body.waifuMode .zoomed_avatar {
flex-basis: max(calc(100% / 2 - 10px), 180px); flex-basis: max(calc(100% / 2 - 10px), 180px);
} }
.BGSampleTitle {
display: none;
}
.tag.excluded:after { .tag.excluded:after {
top: unset; top: unset;
bottom: unset; bottom: unset;
} }
} }
/*this part only only applies to iOS devices*/ /*this part only only applies to iOS devices*/
@supports (-webkit-touch-callout: none) { @supports (-webkit-touch-callout: none) {