Skip to content

Commit

Permalink
Merge pull request #455 from nuno-agostinho/update/1.24.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nuno-agostinho authored Oct 26, 2022
2 parents f513e98 + 800700a commit d9d644a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: psichomics
Title: Graphical Interface for Alternative Splicing Quantification, Analysis and
Visualisation
Version: 1.22.1
Version: 1.24.0
Encoding: UTF-8
Authors@R: c(
person("Nuno", "Saraiva-Agostinho",
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# psichomics 1.24.0 (26 Oct, 2022)

* Bug fix: psichomics app now opens as expected instead of crashing

# psichomics 1.22.1 (14 July, 2022)

* Bug fix: GTEx data v8 can now be downloaded using newer versions of R
Expand Down
2 changes: 1 addition & 1 deletion R/app.R
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ modTabPanel <- function(title, ..., icon=NULL, menu=FALSE) {
replaceStrInList <- function(tag, old, new) {
FUN <- function(x) {
res <- x
if (grepl(old, x)) res <- gsub(old, new, x, fixed=TRUE)
if (any(grepl(old, x))) res <- gsub(old, new, x, fixed=TRUE)
return(res)
}
rapply(tag, FUN, how="replace", classes="character")
Expand Down
6 changes: 4 additions & 2 deletions R/utils_fileBrowserDialog.R
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,11 @@ fileBrowserInput <- function(id, label, value=NULL, placeholder=NULL,

check <- function (x, y) {
# Based on shiny:::`%AND%`
if (!is.null(x) && !is.na(x))
if (!is.null(y) && !is.na(y))
if (!is.null(x) && !is.na(x)) {
if (!is.null(y) && !is.na(y$children[[1]])) {
return(y)
}
}
return(NULL)
}

Expand Down

0 comments on commit d9d644a

Please sign in to comment.