Skip to content

Commit

Permalink
changed maintainer, fixed tests, updated documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
pvictor committed Jan 13, 2020
1 parent c9914c6 commit 30f6b8d
Show file tree
Hide file tree
Showing 26 changed files with 1,662 additions and 1,521 deletions.
18 changes: 9 additions & 9 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Package: manipulateWidget
Type: Package
Title: Add Even More Interactivity to Interactive Charts
Version: 0.10.0
Date: 2018-06-07
Version: 0.10.0.900
Authors@R: c(
person("Jalal-Edine", "ZAWAM", email = "jalal-edine.zawam@rte-france.com", role = c("aut", "cre")),
person("Francois", "Guillem", email = "francois.guillem@rte-france.com", role = c("aut")),
person("Veronique", "Bachelier", email = "veronique.bachelier@rte-france.com", role = c("aut", "cre")),
person("Jalal-Edine", "ZAWAM", role = "aut"),
person("Francois", "Guillem", role = "aut"),
person("RTE", role = "cph"),
person("JJ", "Allaire", role = "ctb"),
person("Marion", "Praz", email="mnpraz@gmail.com", role = "ctb", comment = "New user interface"),
person("Benoit", "Thieurmel", role = "ctb", email = "benoit.thieurmel@datastorm.fr"),
person(given = "Titouan", family = "Robert", email = "titouan.robert@datastorm.fr", role = "ctb"),
person("Duncan", "Murdoch", email = "murdoch.duncan@gmail.com", role = "ctb")
person("Marion", "Praz", email="mnpraz@gmail.com", role = "ctb", comment = "New user interface"),
person("Benoit", "Thieurmel", role = "ctb", email = "benoit.thieurmel@datastorm.fr"),
person(given = "Titouan", family = "Robert", email = "titouan.robert@datastorm.fr", role = "ctb"),
person("Duncan", "Murdoch", email = "murdoch.duncan@gmail.com", role = "ctb")
)
Description: Like package 'manipulate' does for static graphics, this package
helps to easily add controls like sliders, pickers, checkboxes, etc. that
Expand Down Expand Up @@ -40,6 +40,6 @@ Suggests:
testthat,
covr
LazyData: TRUE
RoxygenNote: 6.0.1
RoxygenNote: 7.0.2
VignetteBuilder: knitr
Encoding: UTF-8
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by roxygen2: do not edit by hand
# Generated by roxygen2: do not edit by hand

S3method(summary,MWController)
export(combineWidgets)
Expand Down
2 changes: 1 addition & 1 deletion R/inputs.R
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ mwSlider <- function(min, max, value, label = NULL, ..., .display = TRUE) {
type = "slider", value = value, label = label, params = params,
display = substitute(.display),
validFunc = function(x, params) {
if (is.null(x) || is.na(x)) return(c(params$min, params$max))
if (is.null(x) || all(is.na(x))) return(c(params$min, params$max))
pmin(pmax(params$min, x, na.rm = TRUE), params$max, na.rm = TRUE)
},
htmlFunc = htmlFuncFactory(function(...) {
Expand Down
154 changes: 77 additions & 77 deletions man/MWController-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 30 additions & 30 deletions man/combineWidgets-shiny.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 30f6b8d

Please sign in to comment.