Implemented auto close

JanHolger · JanHolger · commit b2bc8d7f2fa8 · 2019-10-27T23:19:32.000+01:00
diff --git a/client.lua b/client.lua
@@ -11,9 +11,10 @@ function createDialog(title, text, ...)
     dialogs[id] = {
         title = title,
         text = text,
-        columns = {},
+        columns = { { inputs = {}, buttons = {} } },
         buttons = {...},
-        variables = {}
+        variables = {},
+        autoclose = "true"
     }
     return id
 end
@@ -122,6 +123,16 @@ function setVariable(dialog, name, value)
     end
     dialogs[dialog].variables[name] = value
 end
+function setDialogAutoclose(dialog, autoclose)
+    if dialogs[dialog] == nil then
+        return
+    end
+    if autoclose then
+        dialogs[dialog].autoclose = "true"
+    else
+        dialogs[dialog].autoclose = "false"
+    end
+end
 function replaceVariables(text, variables)
     for k,v in pairs(variables) do
         text = text:gsub("{"..k.."}", v)
@@ -148,9 +159,9 @@ function showDialog(dialog)
     end
     lastOpened = dialog
     local d = dialogs[dialog]
-    local json = ""
+    local json = "autoclose:"..d.autoclose..","
     if d.title ~= nil then
-        json = "title:\""..replaceVariables(d.title, d.variables).."\","
+        json = json.."title:\""..replaceVariables(d.title, d.variables).."\","
     end
     if d.text ~= nil then
         json = json.."text:\""..replaceVariables(d.text, d.variables).."\","
@@ -221,7 +232,6 @@ function showDialog(dialog)
             json = json.."\""..replaceVariables(d.buttons[i], d.variables).."\""
         end
     end
-    print("SetDialog("..dialog..",{"..json.."]});")
     ExecuteWebJS(web, "SetDialog("..dialog..",{"..json.."]});")
     SetIgnoreLookInput(true)
     SetIgnoreMoveInput(true)
@@ -245,4 +255,5 @@ AddFunctionExport("show", showDialog)
 AddFunctionExport("close", closeDialog)
 AddFunctionExport("destroy", destroyDialog)
 AddFunctionExport("setSelectOptions", setDialogSelectOptions)
-AddFunctionExport("setSelectLabeledOptions", setDialogSelectOptionsWithLabels)
+AddFunctionExport("setSelectLabeledOptions", setDialogSelectOptionsWithLabels)
+AddFunctionExport("setAutoClose", setDialogAutoclose)
diff --git a/dialog.css b/dialog.css
@@ -124,6 +124,14 @@ body {
     margin-bottom: 5px;
 }
 
+.menu-input-slider {
+    width: calc(100% - 8px);
+    background-color: #262626;
+    color: white;
+    outline: none;
+    margin-bottom: 5px;
+}
+
 .menu-checkbox {
 
 }
diff --git a/dialog.js b/dialog.js
@@ -6,8 +6,12 @@ function SetDialog(id, json) {
     while (menuDiv.firstChild !== null) {
         menuDiv.removeChild(menuDiv.firstChild);
     }
+    let boxWidth = json.columns.length;
+    if(boxWidth < 1){
+        boxWidth = 1;
+    }
     let menuContentDiv = document.createElement("div");
-    menuContentDiv.style.width = (json.columns.length*300)+"px";;
+    menuContentDiv.style.width = (boxWidth*300)+"px";
     if (json.title !== undefined) {
         if(json.title.length > 0){
             let titleH = document.createElement("h1");
@@ -28,7 +32,7 @@ function SetDialog(id, json) {
     }
     let gridElement = document.createElement("div");
     gridElement.className = "row";
-    gridElement.style.width = (json.columns.length*300)+"px";
+    gridElement.style.width = (boxWidth*300)+"px";
     gridElement.style.marginLeft = "0px";
     let rendered = 0;
     for(let colId=0; colId<json.columns.length; colId++){
@@ -117,7 +121,7 @@ function SetDialog(id, json) {
     }
     gridElement = document.createElement("div");
     gridElement.className = "row";
-    gridElement.style.width = (json.columns.length*300)+"px";
+    gridElement.style.width = (boxWidth*300)+"px";
     gridElement.style.marginLeft = "0px";
     for(let colId=0; colId<json.columns.length; colId++){
         let column = json.columns[colId];

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,14 @@ body {`
`124`	`124`	`margin-bottom: 5px;`
`125`	`125`	`}`
`126`	`126`
	`127`	`+.menu-input-slider {`
	`128`	`+ width: calc(100% - 8px);`
	`129`	`+ background-color: #262626;`
	`130`	`+ color: white;`
	`131`	`+ outline: none;`
	`132`	`+ margin-bottom: 5px;`
	`133`	`+}`
	`134`	`+`
`127`	`135`	`.menu-checkbox {`
`128`	`136`
`129`	`137`	`}`