From 0693ff2123feed88a1bb76627e0bdcf53a976cd8 Mon Sep 17 00:00:00 2001 From: Jens Preussner Date: Mon, 14 Oct 2019 13:54:47 +0200 Subject: [PATCH] Fixed bugs from changed wording --- 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 18b56d6..283fe57 100755 --- a/wilson-basic/app.R +++ b/wilson-basic/app.R @@ -563,9 +563,9 @@ server <- function(session, input, output) { output$fileLoader <- renderUI({ shiny::req(input$data_origin) - if (input$data_origin == "Examples") { + if (input$data_origin == "Select from list") { return(selectizeInput(inputId = "fileLoader", label = "Select data set", choices = load, selected = input$fileLoader)) - } else if (input$data_origin == "Upload") { + } else if (input$data_origin == "Upload file") { return(fileInput(inputId = "fileLoader2", label = "Upload clarion file", accept = c(".se", ".clarion"))) } }) @@ -574,19 +574,19 @@ server <- function(session, input, output) { last_upload <- reactiveVal(value = "") # returns filepath file_path <- eventReactive({ - if (isTruthy(input$fileLoader) && input$data_origin == "Examples") { + if (isTruthy(input$fileLoader) && input$data_origin == "Select from list") { return(TRUE) - } else if (isTruthy(input$fileLoader2$datapath) && input$data_origin == "Upload" && input$fileLoader2$datapath != isolate(last_upload())) { + } else if (isTruthy(input$fileLoader2$datapath) && input$data_origin == "Upload file" && input$fileLoader2$datapath != isolate(last_upload())) { last_upload(input$fileLoader2$datapath) return(TRUE) } }, { - if (input$data_origin == "Examples") { + if (input$data_origin == "Select from list") { shiny::req(input$fileLoader) return(list(path = input$fileLoader, name = input$fileLoader)) - } else if (input$data_origin == "Upload") { + } else if (input$data_origin == "Upload file") { shiny::req(input$fileLoader2$datapath) # copy for debugging