Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed bugs from changed wording
  • Loading branch information
jenzopr committed Oct 14, 2019
1 parent d7911c3 commit 0693ff2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions wilson-basic/app.R
Expand Up @@ -563,9 +563,9 @@ server <- function(session, input, output) {
output$fileLoader <- renderUI({ output$fileLoader <- renderUI({
shiny::req(input$data_origin) 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)) 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"))) return(fileInput(inputId = "fileLoader2", label = "Upload clarion file", accept = c(".se", ".clarion")))
} }
}) })
Expand All @@ -574,19 +574,19 @@ server <- function(session, input, output) {
last_upload <- reactiveVal(value = "") last_upload <- reactiveVal(value = "")
# returns filepath # returns filepath
file_path <- eventReactive({ file_path <- eventReactive({
if (isTruthy(input$fileLoader) && input$data_origin == "Examples") { if (isTruthy(input$fileLoader) && input$data_origin == "Select from list") {
return(TRUE) 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) last_upload(input$fileLoader2$datapath)


return(TRUE) return(TRUE)
} }
}, { }, {
if (input$data_origin == "Examples") { if (input$data_origin == "Select from list") {
shiny::req(input$fileLoader) shiny::req(input$fileLoader)


return(list(path = input$fileLoader, name = 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) shiny::req(input$fileLoader2$datapath)


# copy for debugging # copy for debugging
Expand Down

0 comments on commit 0693ff2

Please sign in to comment.