github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-04-07 03:00:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

sliderInput: add timeFormat argument

Browse Source
This commit is contained in:
Winston Chang
2015-07-02 15:48:12 -05:00
parent 9b91ebb8d2
commit ec9bfc4731
4 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
R/input-slider.R
View File

@@ -32,6 +32,13 @@
#' values). If \code{TRUE}, the range can be dragged. In other words, the min
#' and max can be dragged together. If \code{FALSE} (the default), the range
#' cannot be dragged.
#' @param timeFormat Only used if the values are Date or POSIXt objects. A time
#' format string, to be passed to the Javascript strftime library. See
#' \url{https://github.com/samsonjs/strftime} for more details. The allowed
#' format specifications are very similar, but not identical to those for R's
#' \code{\link{strftime}} function. For Dates, the default is \code{"\%F"}
#' (like \code{"2015-07-01"}), and for POSIXt, the default is \code{"\%F \%T"}
#' (like \code{"2015-07-01 15:32:10"}).
#' @inheritParams selectizeInput
#' @family input elements
#' @seealso \code{\link{updateSliderInput}}
@@ -40,8 +47,9 @@
sliderInput <- function(inputId, label, min, max, value, step = NULL,
round = FALSE, format = NULL, locale = NULL,
ticks = TRUE, animate = FALSE, width = NULL, sep = ",",
pre = NULL, post = NULL, dragRange = FALSE) {
pre = NULL, post = NULL, timeFormat = NULL,
dragRange = FALSE)
{
if (!missing(format)) {
shinyDeprecated(msg = "The `format` argument to sliderInput is deprecated. Use `sep`, `pre`, and `post` instead.",
version = "0.10.2.2")
@@ -70,11 +78,17 @@ sliderInput <- function(inputId, label, min, max, value, step = NULL,
stop("`min`, `max`, and `value must all be Date or non-Date objects")
dataType <- "date"
if (is.null(timeFormat))
timeFormat <- "%F"
} else if (inherits(min, "POSIXt")) {
if (!inherits(max, "POSIXt") || !inherits(value, "POSIXt"))
stop("`min`, `max`, and `value must all be POSIXt or non-POSIXt objects")
dataType <- "datetime"
if (is.null(timeFormat))
timeFormat <- "%F %T"
} else {
dataType <- "number"
}
@@ -126,7 +140,9 @@ sliderInput <- function(inputId, label, min, max, value, step = NULL,
`data-keyboard` = TRUE,
`data-keyboard-step` = step / (max - min) * 100,
`data-drag-interval` = dragRange,
`data-data-type` = dataType
# The following are ignored by the ion.rangeSlider, but are used by Shiny.
`data-data-type` = dataType,
`data-time-format` = timeFormat
))
# Replace any TRUE and FALSE with "true" and "false"

11
man/sliderInput.Rd
View File

@@ -7,7 +7,8 @@
\usage{
sliderInput(inputId, label, min, max, value, step = NULL, round = FALSE,
format = NULL, locale = NULL, ticks = TRUE, animate = FALSE,
width = NULL, sep = ",", pre = NULL, post = NULL, dragRange = FALSE)
width = NULL, sep = ",", pre = NULL, post = NULL, timeFormat = NULL,
dragRange = FALSE)
animationOptions(interval = 1000, loop = FALSE, playButton = NULL,
pauseButton = NULL)
@@ -57,6 +58,14 @@ see \code{\link{validateCssUnit}}.}
\item{post}{A suffix string to put after the value.}
\item{timeFormat}{Only used if the values are Date or POSIXt objects. A time
format string, to be passed to the Javascript strftime library. See
\url{https://github.com/samsonjs/strftime} for more details. The allowed
format specifications are very similar, but not identical to those for R's
\code{\link{strftime}} function. For Dates, the default is \code{"\%F"}
(like \code{"2015-07-01"}), and for POSIXt, the default is \code{"\%F \%T"}
(like \code{"2015-07-01 15:32:10"}).}
\item{dragRange}{This option is used only if it is a range slider (with two
values). If \code{TRUE}, the range can be dragged. In other words, the min
and max can be dragged together. If \code{FALSE} (the default), the range

1
srcjs/_start.js
View File

@@ -7,6 +7,7 @@
curly:false,
indent:2
*/
/* global strftime */
(function() {
var $ = jQuery;

11
srcjs/input_binding_slider.js
View File

@@ -99,17 +99,12 @@ $.extend(sliderInputBinding, textInputBinding, {
var opts = {};
var $el = $(el);
var dataType = $el.data('data-type');
var timeFormat = $el.data('time-format');
// Set up formatting functions
if (dataType === 'date') {
if (dataType === 'date' || dataType === 'datetime') {
opts.prettify = function(num) {
return formatDateUTC(new Date(num));
};
} else if (dataType === 'datetime') {
opts.prettify = function(num) {
var date = new Date(num);
return date.toUTCString();
return strftime(timeFormat, new Date(num));
};
}