From e281aef423be4a4190bd3c2a3d84c16698b4a033 Mon Sep 17 00:00:00 2001 From: Schultheis Date: Wed, 17 Mar 2021 16:46:15 +0100 Subject: [PATCH] remove returns --- wilson-basic/app.R | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wilson-basic/app.R b/wilson-basic/app.R index cda8718..a617d29 100755 --- a/wilson-basic/app.R +++ b/wilson-basic/app.R @@ -561,9 +561,9 @@ server <- function(session, input, output) { shiny::req(input$data_origin) if (input$data_origin == "Select from list") { - return(selectizeInput(inputId = "fileLoader", label = "Select data set", choices = load, selected = input$fileLoader)) + selectizeInput(inputId = "fileLoader", label = "Select data set", choices = load, selected = input$fileLoader) } else if (input$data_origin == "Upload file") { - return(fileInput(inputId = "fileLoader2", label = "Upload clarion file", accept = c(".se", ".clarion"))) + fileInput(inputId = "fileLoader2", label = "Upload clarion file", accept = c(".se", ".clarion")) } }) @@ -572,17 +572,17 @@ server <- function(session, input, output) { # returns filepath file_path <- eventReactive({ if (isTruthy(input$fileLoader) && input$data_origin == "Select from list") { - return(TRUE) + TRUE } else if (isTruthy(input$fileLoader2$datapath) && input$data_origin == "Upload file" && input$fileLoader2$datapath != isolate(last_upload())) { last_upload(input$fileLoader2$datapath) - return(TRUE) + TRUE } }, { if (input$data_origin == "Select from list") { shiny::req(input$fileLoader) - return(list(path = input$fileLoader, name = input$fileLoader)) + list(path = input$fileLoader, name = input$fileLoader) } else if (input$data_origin == "Upload file") { shiny::req(input$fileLoader2$datapath) @@ -593,7 +593,7 @@ server <- function(session, input, output) { file.copy(from = input$fileLoader2$datapath, to = file.path("logs", paste(session$token, date, input$fileLoader2$name, sep = "_"))) } - return(list(path = input$fileLoader2$datapath, name = input$fileLoader2$name)) + list(path = input$fileLoader2$datapath, name = input$fileLoader2$name) } })