diff --git a/public/User Avatars/you1.png b/public/User Avatars/you1.png
deleted file mode 100644
index e241153a4..000000000
Binary files a/public/User Avatars/you1.png and /dev/null differ
diff --git a/public/characters/Aqua.png b/public/characters/Aqua.png
index 6da8e87e1..96997c06e 100644
Binary files a/public/characters/Aqua.png and b/public/characters/Aqua.png differ
diff --git a/public/characters/Darkness.png b/public/characters/Darkness.png
index e3aea3fd2..85106e240 100644
Binary files a/public/characters/Darkness.png and b/public/characters/Darkness.png differ
diff --git a/public/index.html b/public/index.html
index 0df7c3cf0..913eb9679 100644
--- a/public/index.html
+++ b/public/index.html
@@ -45,18 +45,10 @@
const systemCharName = 'Chloe';
var default_user_name = "You";
var name1 = default_user_name;
- var name2 = systemCharName;
+ var name2 = "Chloe";
// might want to migrate this to 'system message' code
- var chat = [{
- name: systemCharName,
- is_user: false,
- is_name: true,
- create_date: 0,
- mes: '\n*You went inside. The air smelled of fried meat, tobacco and a hint of wine. A dim light was cast by candles, and a fire crackled in the fireplace. It seems to be a very pleasant place. Behind the wooden bar is an elf waitress, she is smiling. Her ears are very pointy, and there is a twinkle in her eye. She wears glasses and a white apron. As soon as she noticed you, she immediately came right up close to you.*\n\n' +
- ' "Hello there! How is your evening going?"
\n' +
- '\n'
- }];
-
+ var chat = [{name: 'Chloe',is_user: false,is_name: true,create_date: 0,mes: '\n*You went inside. The air smelled of fried meat, tobacco and a hint of wine. A dim light was cast by candles, and a fire crackled in the fireplace. It seems to be a very pleasant place. Behind the wooden bar is an elf waitress, she is smiling. Her ears are very pointy, and there is a twinkle in her eye. She wears glasses and a white apron. As soon as she noticed you, she immediately came right up close to you.*\n\n' +' "Hello there! How is your evening going?"
\n'+'\n'}];
+ var safetychat = [{name: 'Chloe',is_user: false,is_name: true,create_date: 0,mes: '\n*You deleted a charcter and arrived back here for safety reasons! Pick another character!*\n\n'}];
var chat_create_date = 0;
//RossAscends: Added function to format dates used in files and chat timestamps to a humanized format.
@@ -66,15 +58,18 @@
//New chats made with characters will use this new formatting.
//Useable variable is (( humanizedISO8601Datetime ))
- var baseDate = new Date(Date.now());
- var humanYear = baseDate.getFullYear();
- var humanMonth = (baseDate.getMonth()+1);
- var humanDate = baseDate.getDate();
- var humanHour = (baseDate.getHours() < 10? '0' : '') + baseDate.getHours();
- var humanMinute = (baseDate.getMinutes() < 10? '0' : '') + baseDate.getMinutes();
- var humanSecond = (baseDate.getSeconds() < 10? '0' : '') + baseDate.getSeconds();
- var humanMillisecond = (baseDate.getMilliseconds() < 10? '0' : '') + baseDate.getMilliseconds();
- var humanizedISO8601DateTime = (humanYear+"-"+humanMonth+"-"+humanDate+" @"+humanHour+"h "+humanMinute+"m "+humanSecond+"s "+humanMillisecond+"ms");
+ function humanizedISO8601DateTime() {
+ let baseDate = new Date(Date.now());
+ let humanYear = baseDate.getFullYear();
+ let humanMonth = (baseDate.getMonth()+1);
+ let humanDate = baseDate.getDate();
+ let humanHour = (baseDate.getHours() < 10? '0' : '') + baseDate.getHours();
+ let humanMinute = (baseDate.getMinutes() < 10? '0' : '') + baseDate.getMinutes();
+ let humanSecond = (baseDate.getSeconds() < 10? '0' : '') + baseDate.getSeconds();
+ let humanMillisecond = (baseDate.getMilliseconds() < 10? '0' : '') + baseDate.getMilliseconds();
+ let HumanizedDateTime = (humanYear+"-"+humanMonth+"-"+humanDate+" @"+humanHour+"h "+humanMinute+"m "+humanSecond+"s "+humanMillisecond+"ms");
+ return HumanizedDateTime;
+ };
var default_ch_mes = "Hello";
@@ -86,6 +81,7 @@
let selected_group = null;
let is_group_automode_enabled = false;
var this_chid;
+ var active_character;
var backgrounds = [];
var default_avatar = 'img/fluffy.png';
var is_colab = false;
@@ -208,6 +204,8 @@
var style_anchor = true;
var character_anchor = true;
let extension_prompt = '';
+ var auto_connect = false;
+ var auto_load_chat = false;
var main_api = 'kobold';
//novel settings
@@ -256,21 +254,46 @@
xhr.setRequestHeader("X-CSRF-Token", token);
});
+
$.get("/csrf-token")
.then(data => {
token = data.token;
+ getCharacters();
getSettings("def");
getLastVersion();
- getCharacters();
-
+ //getCharacters();
printMessages();
getBackgrounds();
getUserAvatars();
+ autoloadchat();
+ autoconnect();
});
+
+ function flushSettings() {
+ $('#settings_perset').empty();
+ $('#world_info').empty();
+ $('#world_info').append('');
+ }
+
+ //RossAscends: a smaller load-up function to be used instead of refreshing the page in cases like deleting a character and changing username
+ function QuickRefresh(){
+ flushSettings();
+ clearChat();
+ //characters.length = 0 //if this could be enabled it would allow the GetCharacters function to detect files added or removed from the char dir on each panel load
+ console.log('quickRefresh() -- active_character -- '+active_character);
+ console.log('quickRefresh() -- this_chid -- '+this_chid);
+ getSettings("def");
+ getCharacters();
+ getUserAvatars();
+ //console.log(chat);
+ printMessages();
+ $( "#rm_button_selected_ch" ).css("class","deselected-right-tab");
+ $( "#rm_button_selected_ch" ).children("h2").text('');
+ if (NavToggle.checked === false) {
+ document.getElementById('nav-toggle').click();
+ };
+ }
- $('#characloud_url').click(function(){
- window.open('https://boosty.to/tavernai', '_blank');
- });
$('#character_search_bar').on('input', function() {
const searchValue = $(this).val().trim().toLowerCase();
@@ -284,6 +307,10 @@
});
}
});
+
+ $('#characloud_url').click(function(){
+ window.open('https://boosty.to/tavernai', '_blank');
+ });
function checkOnlineStatus(){
//console.log(online_status);
if(online_status == 'no_connection'){
@@ -394,7 +421,6 @@
}
}
}
-
function resultCheckStatus(){
is_api_button_press = false;
checkOnlineStatus();
@@ -461,18 +487,22 @@
}
function printCharacters(){
- //console.log(1);
+ //console.log('printCharacters() entered');
+
$("#rm_print_characters_block").empty();
+ console.log('printCharacters() -- sees '+characters.length+' characters.');
characters.forEach(function(item, i, arr) {
+
var this_avatar = default_avatar;
if(item.avatar != 'none'){
this_avatar = "characters/"+item.avatar+"?"+Date.now();
- }
- $("#rm_print_characters_block").prepend('
'+item.name+'
');
- //console.log(item.name);
+ } //RossAscends: changed 'prepend' to 'append' to make alphabetical sorting display correctly.
+ $("#rm_print_characters_block").append('
'+item.name+'
');
+ console.log('printcharacters() -- printing -- ChID '+i+' ('+item.name+')');
});
printGroups();
+
}
function printGroups() {
@@ -550,7 +580,9 @@
async function getCharacters() {
await getGroups();
- const response = await fetch("/getcharacters", {
+ //console.log('getCharacters() -- entered');
+ //console.log(characters);
+ var response = await fetch("/getcharacters", { //RossAscends: changed from const
method: "POST",
headers: {
"Content-Type": "application/json",
@@ -559,26 +591,44 @@
body: JSON.stringify({
"": ""
})
-
});
if (response.ok === true) {
- const getData = await response.json();
- //console.log(getData);
+
+ var getData = ''; //RossAscends: reset to force array to update to account for deleted character.
+ var getData = await response.json(); //RossAscends: changed from const
+ //console.log(getData);
+
//var aa = JSON.parse(getData[0]);
- const load_ch_count = Object.getOwnPropertyNames(getData);
+ var load_ch_count = Object.getOwnPropertyNames(getData); //RossAscends: change from const to create dynamic character load amounts.
+ var charCount = load_ch_count.length;
+ //console.log('/getcharacters -- expecting to load '+charCount+' characters.')
for(var i = 0; i < load_ch_count.length;i++){
-
- //characters[i] = [];
+ characters[i] = [];
characters[i] = getData[i];
-
- //console.log(characters[i]);
+ //console.log('/getcharacters -- loaded character #'+(i+1)+' ('+characters[i].name+')');
}
- characters.sort((a,b) => a.create_date - b.create_date );
+ //RossAscends: updated character sorting to be alphabetical
+ characters.sort(function (a,b) {
+ //console.log('sorting characters: '+a.name+' vs '+b.name);
+ if(a.name < b.name){
+ return -1
+ }
+ if (a.name > b.name) {
+ return 1;
+ }
+ return 0;
+
+ });
+ //console.log(characters);
+
//characters.reverse();
- if(this_chid != undefined) $("#avatar_url_pole").val(characters[this_chid].avatar);
+ //console.log('/getcharacters -- this_chid -- '+this_chid);
+ if(this_chid != undefined && this_chid != 'invalid-safety-id') $("#avatar_url_pole").val(characters[this_chid].avatar);
+ //console.log('/getcharacters -- sending '+i+' characters to /printcharacters');
printCharacters();
- //console.log(propOwn.length);
+
+ //console.log(propOwn.length);
//return JSON.parse(getData[0]);
//const getData = await response.json();
//var getMessage = getData.results[0].text;
@@ -611,7 +661,7 @@
}
}
- async function isColab() {
+ async function isColab() {
is_checked_colab = true;
const response = await fetch("/iscolab", {
method: "POST",
@@ -705,7 +755,9 @@
}
}
function printMessages(){
- chat.forEach(function(item, i, arr) {
+ //console.log(chat);
+ //console.log('printMessages() -- printing messages for -- '+this_chid+' '+active_character+' '+characters[this_chid]);
+ chat.forEach(function(item, i, arr) {
addOneMessage(item);
});
}
@@ -758,7 +810,7 @@
if (mes.force_avatar) {
avatarImg = mes.force_avatar;
}
- else if(this_chid == undefined){
+ else if(this_chid == undefined || this_chid == "invalid-safety-id"){
avatarImg = "img/chloe.png";
}
else{
@@ -1041,7 +1093,7 @@
chat[chat.length-1]['name'] = name1;
chat[chat.length-1]['is_user'] = true;
chat[chat.length-1]['is_name'] = true;
- chat[chat.length-1]['send_date'] = Date.now();
+ chat[chat.length-1]['send_date'] = humanizedISO8601DateTime();
chat[chat.length-1]['mes'] = textareaText;
chat[chat.length-1]['extra'] = {};
@@ -1498,7 +1550,7 @@
chat[chat.length-1]['name'] = name2;
chat[chat.length-1]['is_user'] = false;
chat[chat.length-1]['is_name'] = this_mes_is_name;
- chat[chat.length-1]['send_date'] = Date.now();
+ chat[chat.length-1]['send_date'] = humanizedISO8601DateTime();
getMessage = $.trim(getMessage);
chat[chat.length-1]['mes'] = getMessage;
@@ -1520,6 +1572,8 @@
} else {
saveChat();
}
+ //console.log('/savechat called by /Generate');
+ saveChat();
}else{
//console.log('run force_name2 protocol');
Generate('force_name2');
@@ -1549,7 +1603,6 @@
is_send_press = false;
}
}
-
async function saveChat() {
chat.forEach(function(item, i) {
if(item['is_user']){
@@ -1580,7 +1633,7 @@
});
}
async function getChat() {
- //console.log(characters[this_chid].chat);
+ console.log('/getchat -- entered for -- '+characters[this_chid].name);
jQuery.ajax({
type: 'POST',
url: '/getchat',
@@ -1600,13 +1653,16 @@
}
//chat = data;
chat_create_date = chat[0]['create_date'];
+ //console.log('/getchat saw chat_create_date: '+chat_create_date);
chat.shift();
}else{
- chat_create_date = Date.now();
+ chat_create_date = humanizedISO8601DateTime();
}
//console.log(chat);
+ //console.log('getChatResults called by /getchat');
getChatResult();
+ //console.log('savechat called by /getchat');
saveChat();
},
error: function (jqXHR, exception) {
@@ -1616,7 +1672,6 @@
}
});
}
-
function getChatResult(){
name2 = characters[this_chid].name;
if(chat.length > 1){
@@ -1636,7 +1691,7 @@
chat[0]['name'] = name2;
chat[0]['is_user'] = false;
chat[0]['is_name'] = true;
- chat[0]['send_date'] = Date.now();
+ chat[0]['send_date'] = humanizedISO8601DateTime();
if(characters[this_chid].first_mes != ""){
chat[0]['mes'] = characters[this_chid].first_mes;
}else{
@@ -1662,7 +1717,7 @@
}
});
- //RossAscends: Lets add some hotkeys
+ //RossAscends: Additional hotkeys
document.addEventListener('keydown', (event) => {
if(event.ctrlKey && event.key == "Enter") { // Ctrl+Enter for Regeneration Last Response
@@ -1684,11 +1739,12 @@
$( "#rm_button_create" ).css("class","deselected-right-tab");
$( "#rm_button_characters" ).css("class","deselected-right-tab");
+
$( "#rm_button_settings" ).click(function() {
selected_button = 'settings';
menu_type = 'settings';
$( "#rm_characters_block" ).css("display", "none");
- $( "#rm_api_block" ).css("display", "block");
+ $( "#rm_api_block" ).css("display", "grid");
$('#rm_api_block').css('opacity',0.0);
$('#rm_api_block').transition({
opacity: 1.0,
@@ -2153,12 +2209,12 @@
});
function select_rm_create(){
menu_type = 'create';
+//console.log('select_rm_Create() -- selected button: '+selected_button);
if(selected_button == 'create'){
if(create_save_avatar != ''){
$("#add_avatar_button").get(0).files = create_save_avatar;
read_avatar_load($("#add_avatar_button").get(0));
}
-
}
$( "#rm_characters_block" ).css("display", "none");
$( "#rm_api_block" ).css("display", "none");
@@ -2173,11 +2229,13 @@
complete: function() { }
});
$( "#rm_info_block" ).css("display", "none");
-
$( "#delete_button_div" ).css("display", "none");
+ $( "#delete_button" ).css("display", "none");
+ $( "#export_button" ).css("display", "none");
$("#create_button").css("display", "block");
$("#create_button").attr("value", "Create");
- $('#result_info').html(' ');
+ //RossAscends: commented this out as part of the auto-loading token counter
+ //$('#result_info').html(' ');
$( "#rm_button_characters" ).css("class","deselected-right-tab");
$( "#rm_button_settings" ).css("class","deselected-right-tab");
$( "#rm_button_selected_ch" ).css("class","deselected-right-tab");
@@ -2204,7 +2262,7 @@
$("#form_create").attr("actiontype", "createcharacter");
}
function select_rm_characters(){
-
+ QuickRefresh();
menu_type = 'characters';
$( "#rm_characters_block" ).css("display", "block");
$('#rm_characters_block').css('opacity',0.0);
@@ -2237,14 +2295,15 @@
$( "#rm_button_settings" ).css("class","deselected-right-tab");
$( "#rm_button_selected_ch" ).css("class","deselected-right-tab");
}
-
function select_selected_character(chid){ //character select
-
+ //console.log('select_selected_character() -- starting with input of -- '+chid+' (name:'+characters[chid].name+')');
select_rm_create();
menu_type = 'character_edit';
- $( "#delete_button_div" ).css("display", "block");
+ $( "#delete_button" ).css("display", "block");
+ $( "#export_button" ).css("display", "block");
$( "#rm_button_selected_ch" ).css("class","selected-right-tab");
var display_name = characters[chid].name;
+
$( "#rm_button_selected_ch" ).children("h2").text(display_name);
@@ -2284,21 +2343,34 @@
$("#name_div").css("display", "none");
$("#form_create").attr("actiontype", "editcharacter");
+ active_character = chid;
+ //console.log('select_selected_character() -- active_character -- '+chid+'(ChID of '+display_name+')');
+ saveSettings();
+ //console.log('select_selected_character() -- called saveSettings() to save -- active_character -- '+active_character+'(ChID of '+display_name+')');
+
}
$(document).on('click', '.character_select', function(){
- if(this_chid !== $(this).attr("chid")){
+ if(this_chid !== $(this).attr("chid")){ //if clicked on a different character from what was currently selected
if(!is_send_press){
selected_group = null;
is_group_generating = false;
this_edit_mes_id = undefined;
selected_button = 'character_edit';
this_chid = $(this).attr("chid");
+ active_character = this_chid;
clearChat();
chat.length = 0;
- getChat();
-
+ getChat();
+ var count_tokens = encode(JSON.stringify(characters[this_chid].description+characters[this_chid].personality+characters[this_chid].scenario+characters[this_chid].mes_example)).length;
+ //RossAscends: added token counter to load when a character is selected, instead of waiting for an edit.
+ if(count_tokens < 1024){
+ $('#result_info').html(count_tokens+" Tokens");
+ }else{
+ $('#result_info').html(""+count_tokens+" Tokens(TOO MANY TOKENS)");
+ }
+ console.log('Clicked on '+characters[this_chid].name+' Active_Character set to: '+active_character+' (ChID:'+this_chid+')');
}
- }else{
+ }else{ //if clicked on character that was already selected
selected_button = 'character_edit';
select_selected_character(this_chid);
}
@@ -2448,7 +2520,6 @@
is_advanced_char_open = false;
$('#character_popup').css('display', 'none');
});
-
$("#dialogue_popup_ok").click(function(){
$("#shadow_popup").css('display', 'none');
$("#shadow_popup").css('opacity:', 0.0);
@@ -2457,19 +2528,29 @@
bg_file_for_del.parent().remove();
}
if(popup_type == 'del_ch'){
+ console.log('Deleting character -- ChID: '+this_chid+ ' -- Name: '+characters[this_chid].name);
var msg = jQuery('#form_create').serialize(); // ID form
jQuery.ajax({
method: 'POST',
url: '/deletecharacter',
beforeSend: function(){
select_rm_info("Character deleted");
-
//$('#create_button').attr('value','Deleting...');
},
data: msg,
cache: false,
success: function(html){
- location.reload();
+ //RossAscends: setting active character to null in order to avoid array errors.
+ //this allows for dynamic refresh of character list after deleting a character.
+ $('#character_cross').click();
+ active_character = 'invalid-safety-id'; //unsets the chid in settings (this prevents AutoLoadChat from trying to load the wrong ChID
+ this_chid = 'invalid-safety-id'; //unsets expected chid before reloading (related to getCharacters/printCharacters from using old arrays)
+ characters.length = 0; // resets the characters array, forcing getcharacters to reset
+ name2="Chloe"; // replaces deleted charcter name with Chloe, since she wil be displayed next.
+ chat = safetychat; // sets up chloe to tell user about having deleted a character
+ saveSettings(); // saving settings to keep changes to variables
+ QuickRefresh(); // call quick refresh of Char list, clears chat, and loads Chloe 'post-char-delete' message.
+ //location.reload(); // this is Humi's original code
//getCharacters();
//$('#create_button_div').html(html);
}
@@ -2493,11 +2574,11 @@
deleteGroup(groupId);
}
}
+ //Make a new chat for selected character
if(popup_type == 'new_chat' && this_chid != undefined && menu_type != "create"){//Fix it; New chat doesn't create while open create character menu
clearChat();
chat.length = 0;
- characters[this_chid].chat = Date.now(); //RossAscends: added character name to new chat filenames and replaced Date.now() with humanizedISO8601DateTime;
- //characters[this_chid].chat = (name2 +' - '+ humanizedISO8601DateTime); //RossAscends: added character name to new chat filenames and replaced Date.now() with humanizedISO8601DateTime;
+ characters[this_chid].chat = (name2 +' - '+ humanizedISO8601DateTime()); //RossAscends: added character name to new chat filenames and replaced Date.now() with humanizedISO8601DateTime;
$("#selected_chat_pole").val(characters[this_chid].chat);
timerSaveEdit = setTimeout(() => {$("#create_button").click();},durationSaveEdit);
getChat();
@@ -2536,7 +2617,6 @@
$("#shadow_popup").css('display', 'block');
$('#shadow_popup').transition({ opacity: 1.0 ,duration: animation_rm_duration, easing:animation_rm_easing});
}
-
function read_bg_load(input) {
if (input.files && input.files[0]) {
var reader = new FileReader();
@@ -2633,8 +2713,8 @@
var formData = new FormData($("#form_create").get(0));
if($("#form_create").attr("actiontype") == "createcharacter"){
- if($("#character_name_pole").val().length > 0){
-
+ if($("#character_name_pole").val().length > 0){ //if the character name text area isn't empty (only posible when creating a new character)
+ //console.log('/createcharacter entered');
jQuery.ajax({
type: 'POST',
url: '/createcharacter',
@@ -2647,7 +2727,7 @@
contentType: false,
processData: false,
success: function(html){
- $('#character_cross').click();
+ $('#character_cross').click(); //closes the advanced character editing popup
$("#character_name_pole").val('');
create_save_name = '';
$("#description_textarea").val('');
@@ -2679,13 +2759,15 @@
select_rm_info("Character created");
$('#rm_info_block').transition({ opacity: 1.0 ,duration: 2000});
-
+
+
getCharacters();
}else{
$('#result_info').html(html);
}
},
error: function (jqXHR, exception) {
+ //alert('ERROR: '+xhr.status+ ' Status Text: '+xhr.statusText+' '+xhr.responseText);
$('#create_button').removeAttr("disabled");
}
});
@@ -2693,8 +2775,8 @@
$('#result_info').html("Name not entered");
}
}else{
- console.log($("#add_avatar_button").val());
-
+ //console.log('/editcharacter -- entered.');
+ //console.log('Avatar Button Value:'+$("#add_avatar_button").val());
jQuery.ajax({
type: 'POST',
url: '/editcharacter',
@@ -2707,14 +2789,12 @@
contentType: false,
processData: false,
success: function(html){
-
$('.mes').each(function(){
if($(this).attr('ch_name') != name1){
$(this).children('.avatar').children('img').attr('src', $('#avatar_load_preview').attr('src'));
}
});
if(chat.length === 1 ){
-
var this_ch_mes = default_ch_mes;
if($('#firstmessage_textarea').val() != ""){
this_ch_mes = $('#firstmessage_textarea').val();
@@ -2732,24 +2812,19 @@
}
}
$('#create_button').removeAttr("disabled");
-
getCharacters();
-
$("#add_avatar_button").replaceWith($("#add_avatar_button").val('').clone(true));
$('#create_button').attr('value','Save');
-
- var count_tokens = encode(JSON.stringify(characters[this_chid].description+characters[this_chid].personality+characters[this_chid].scenario+characters[this_chid].mes_example)).length;
+ //console.log('/editcharacters -- this_chid -- '+this_chid);
+ if(this_chid != undefined && this_chid != 'invalid-safety-id'){ //added check to avoid trying to load tokens in case of character deletion
+ var count_tokens = encode(JSON.stringify(characters[this_chid].description+characters[this_chid].personality+characters[this_chid].scenario+characters[this_chid].mes_example)).length;
+ }
if(count_tokens < 1024){
$('#result_info').html(count_tokens+" Tokens");
}else{
$('#result_info').html(""+count_tokens+" Tokens(TOO MANY TOKENS)");
}
-
- //$('#result_info').transition({ opacity: 0.0 ,delay: 500,duration: 1000,easing: 'in-out',complete: function() {
- //$('#result_info').transition({ opacity: 1.0,duration: 0});
- //$('#result_info').html(' ');
- //}});
},
error: function (jqXHR, exception) {
$('#create_button').removeAttr("disabled");
@@ -2761,7 +2836,7 @@
});
$( "#delete_button" ).click(function() {
popup_type = 'del_ch';
- callPopup('
Delete the character?
');
+ callPopup('
Delete the character?
Page will reload and you will be returned to Chloe.');
});
$( "#rm_info_button" ).click(function() {
$('#rm_info_avatar').html('');
@@ -2861,23 +2936,25 @@
}
});
- // RossAscends: Added functionality that will close the RightNav panels when User clicks outside them
+ // RossAscends: Added functionality that will close the RightNav panel click outside of it or related panels (adv editing popup, or dialog popups)
var NavToggle = document.getElementById("nav-toggle");
var PanelPin = document.getElementById("rm_button_panel_pin");
$('document').ready(function(){
$("html").click(function(e){
- if (NavToggle.checked === true && PanelPin.checked === false) {
- if ($(e.target).attr('id') !== "nav-toggle") {
- if (document.querySelector('#right-nav-panel').contains(e.target) === false){
- document.getElementById('nav-toggle').click();
+ if (NavToggle.checked === true && PanelPin.checked === false) {
+ if ($(e.target).attr('id') !== "nav-toggle") {
+ if (document.querySelector('#right-nav-panel').contains(e.target) === false){
+ if (document.querySelector('#character_popup').contains(e.target) === false){
+ if (document.querySelector('#dialogue_popup').contains(e.target) === false){
+ document.getElementById('nav-toggle').click();
+ }
+ }
+ }
}
- }
- };
+ };
+ });
});
- });
-
- //-------------------------------------------------------------------------------------------------------------
$( "#options_button" ).click(function() { // this is the options button click function, shows the options menu if closed
if($("#options").css('display') === 'none' && $("#options").css('opacity') == 0.0){
@@ -2923,7 +3000,6 @@
callPopup('