\
-
\
- "+ob.label+"
?"+ob.tooltip+" \
+ if(ob.uitype == "slider"){
+ settings_menu.append("
\
+
\
+
\
+ "+ob.label+" ?"+ob.tooltip+" \
+
\
+
\
+ "+ob.default+"\
+
\
\
-
\
- "+ob.default+"\
+
\
+
\
-
\
-
\
-
\
-
\
-
\
- "+ob.min+"\
+
\
+
\
+ "+ob.min+"\
+
\
+
\
+ "+ob.max+"\
+
\
\
-
\
- "+ob.max+"\
-
\
-
\
-
");
- // Set references to HTML objects
- var refin = $("#"+ob.id);
- var reflb = $("#"+ob.id+"cur");
- window["setting_"+ob.id] = refin; // Is this still needed?
- window["label_"+ob.id] = reflb; // Is this still needed?
- // Add event function to input
- refin.on("input", function () {
- socket.send({'cmd': $(this).attr('id'), 'data': $(this).val()});
- });
+
");
+ // Set references to HTML objects
+ var refin = $("#"+ob.id);
+ var reflb = $("#"+ob.id+"cur");
+ window["setting_"+ob.id] = refin; // Is this still needed?
+ window["label_"+ob.id] = reflb; // Is this still needed?
+ // Add event function to input
+ refin.on("input", function () {
+ socket.send({'cmd': $(this).attr('id'), 'data': $(this).val()});
+ });
+ } else if(ob.uitype == "toggle"){
+ settings_menu.append("
\
+ "+ob.label+" \
+ ?"+ob.tooltip+" \
+
");
+ // Tell Bootstrap-Toggle to render the new checkbox
+ $("input[type=checkbox]").bootstrapToggle();
+ $("#"+ob.id).on("change", function () {
+ if(allowtoggle) {
+ socket.send({'cmd': $(this).attr('id'), 'data': $(this).prop('checked')});
+ }
+ });
+ }
}
function addFormat(ob) {
@@ -371,6 +389,7 @@ function dosubmit() {
socket.send({'cmd': 'submit', 'data': txt});
input_text.val("");
hideMessage();
+ hidegenseqs();
}
function newTextHighlight(ref) {
@@ -463,6 +482,42 @@ function hideNewStoryPopup() {
nspopup.addClass("hidden");
}
+function setStartState() {
+ enableSendBtn();
+ enableButtons([button_actmem, button_actwi]);
+ disableButtons([button_actedit, button_actback, button_actretry]);
+ hide([wi_menu, button_delete]);
+ show([game_text, button_actedit, button_actmem, button_actwi, button_actback, button_actretry]);
+ hideMessage();
+ hideWaitAnimation();
+ button_actedit.html("Edit");
+ button_actmem.html("Memory");
+ button_actwi.html("W Info");
+ hideAidgPopup();
+ hideSaveAsPopup();
+ hideLoadPopup();
+ hideNewStoryPopup();
+ hidegenseqs();
+}
+
+function parsegenseqs(seqs) {
+ seqselcontents.html("");
+ var i;
+ for(i=0; i
"+seqs[i].generated_text+" ");
+ $("#seqsel"+i).on("click", function () {
+ socket.send({'cmd': 'seqsel', 'data': $(this).attr("n")});
+ });
+ }
+ $('#seqselmenu').slideDown("slow");
+}
+
+function hidegenseqs() {
+ $('#seqselmenu').slideUp("slow", function() {
+ seqselcontents.html("");
+ });
+}
+
//=================================================================//
// READY/RUNTIME
//=================================================================//
@@ -478,6 +533,7 @@ $(document).ready(function(){
button_load = $('#btn_load');
button_loadfrfile = $('#btn_loadfromfile');
button_import = $("#btn_import");
+ button_importwi = $("#btn_importwi");
button_impaidg = $("#btn_impaidg");
button_settings = $('#btn_settings');
button_format = $('#btn_format');
@@ -519,6 +575,8 @@ $(document).ready(function(){
nspopup = $("#newgamecontainer");
ns_accept = $("#btn_nsaccept");
ns_close = $("#btn_nsclose");
+ seqselmenu = $("#seqselmenu");
+ seqselcontents = $("#seqselcontents");
// Connect to SocketIO server
loc = window.document.location;
@@ -552,20 +610,7 @@ $(document).ready(function(){
disableButtons([button_actedit, button_actmem, button_actwi, button_actback, button_actretry]);
showWaitAnimation();
} else if(msg.data == "start") {
- enableSendBtn();
- enableButtons([button_actmem, button_actwi]);
- disableButtons([button_actedit, button_actback, button_actretry]);
- hide([wi_menu, button_delete]);
- show([game_text, button_actedit, button_actmem, button_actwi, button_actback, button_actretry]);
- hideMessage();
- hideWaitAnimation();
- button_actedit.html("Edit");
- button_actmem.html("Memory");
- button_actwi.html("W Info");
- hideAidgPopup();
- hideSaveAsPopup();
- hideLoadPopup();
- hideNewStoryPopup();
+ setStartState();
}
} else if(msg.cmd == "editmode") {
// Enable or Disable edit mode
@@ -657,16 +702,16 @@ $(document).ready(function(){
addFormat(msg.data);
} else if(msg.cmd == "updatefrmttriminc") {
// Update toggle state
- $("#frmttriminc").prop('checked', msg.data).change()
+ $("#frmttriminc").prop('checked', msg.data).change();
} else if(msg.cmd == "updatefrmtrmblln") {
// Update toggle state
- $("#frmtrmblln").prop('checked', msg.data).change()
+ $("#frmtrmblln").prop('checked', msg.data).change();
} else if(msg.cmd == "updatefrmtrmspch") {
// Update toggle state
- $("#frmtrmspch").prop('checked', msg.data).change()
+ $("#frmtrmspch").prop('checked', msg.data).change();
} else if(msg.cmd == "updatefrmtadsnsp") {
// Update toggle state
- $("#frmtadsnsp").prop('checked', msg.data).change()
+ $("#frmtadsnsp").prop('checked', msg.data).change();
} else if(msg.cmd == "allowtoggle") {
// Allow toggle change states to propagate
allowtoggle = msg.data;
@@ -707,6 +752,29 @@ $(document).ready(function(){
} else if(msg.cmd == "askforoverwrite") {
// Show overwrite warning
show([saveasoverwrite]);
+ } else if(msg.cmd == "genseqs") {
+ // Parse generator sequences to UI
+ parsegenseqs(msg.data);
+ } else if(msg.cmd == "hidegenseqs") {
+ // Collapse genseqs menu
+ hidegenseqs();
+ } else if(msg.cmd == "setlabelnumseq") {
+ // Update setting label with value from server
+ $("#setnumseqcur").html(msg.data);
+ } else if(msg.cmd == "updatenumseq") {
+ // Send current max tokens value to input
+ $("#setnumseq").val(parseInt(msg.data));
+ $("#setnumseqcur").html(msg.data);
+ } else if(msg.cmd == "setlabelwidepth") {
+ // Update setting label with value from server
+ $("#setwidepthcur").html(msg.data);
+ } else if(msg.cmd == "updatewidepth") {
+ // Send current max tokens value to input
+ $("#setwidepth").val(parseInt(msg.data));
+ $("#setwidepthcur").html(msg.data);
+ } else if(msg.cmd == "updateuseprompt") {
+ // Update toggle state
+ $("#setuseprompt").prop('checked', msg.data).change();
}
});
@@ -723,10 +791,12 @@ $(document).ready(function(){
button_actretry.on("click", function(ev) {
socket.send({'cmd': 'retry', 'data': ''});
+ hidegenseqs();
});
button_actback.on("click", function(ev) {
socket.send({'cmd': 'back', 'data': ''});
+ hidegenseqs();
});
button_actedit.on("click", function(ev) {
@@ -753,6 +823,10 @@ $(document).ready(function(){
socket.send({'cmd': 'import', 'data': ''});
});
+ button_importwi.on("click", function(ev) {
+ socket.send({'cmd': 'importwi', 'data': ''});
+ });
+
button_settings.on("click", function(ev) {
$('#settingsmenu').slideToggle("slow");
});
diff --git a/static/custom.css b/static/custom.css
index 56db8eae..0fa720ca 100644
--- a/static/custom.css
+++ b/static/custom.css
@@ -32,7 +32,8 @@ chunk {
}
#settingsmenu {
- display:none;
+ display: flex;
+ flex-wrap: wrap;
background-color: #295071;
padding: 10px;
}
@@ -73,6 +74,13 @@ chunk {
width: 100%;
}
+#seqselmenu {
+ display:none;
+ padding: 10px;
+ border-top: 2px solid #303030;
+ background-color: #262626;
+}
+
#actionmenu {
margin-top: 10px;
}
@@ -346,7 +354,7 @@ chunk {
margin-bottom: 5px;
}
-.formatrow {
+.formatrow:only-child {
}
@@ -549,11 +557,38 @@ chunk {
margin-right: 10px;
}
+.seqselheader {
+ color: #737373;
+}
+
+.seqselitem {
+ border: 1px solid #959595;
+ border-radius: 5px;
+ padding: 5px;
+ color: #ffffff;
+ -moz-transition: all 0.15s ease-in;
+ -o-transition: all 0.15s ease-in;
+ -webkit-transition: all 0.15s ease-in;
+}
+
+.seqselitem:hover {
+ cursor: pointer;
+ border: 1px solid #ffffff;
+ background-color: #3a3a3a;
+}
+
+.seqselitem + .seqselitem {
+ margin-top: 5px;
+}
+
.settingitem {
- width: 18%;
+ width: 20%;
padding-left: 10px;
padding-right: 10px;
+ padding-bottom: 5px;
+ padding-top: 5px;
display: inline-block;
+ border-bottom: 1px solid #12324f;
}
.settingsave {
diff --git a/templates/index.html b/templates/index.html
index 569dd6ed..bbf574d7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -49,6 +49,7 @@
Import
@@ -67,7 +68,7 @@