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

Add class attribute to ShinySession object

Browse Source
This commit is contained in:
Winston Chang
2015-02-27 11:09:39 -06:00
parent 46844b516a
commit 0f642fe3ad
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
R/progress.R
View File

@@ -83,8 +83,8 @@ Progress <- R6Class(
public = list(
initialize = function(session = getDefaultReactiveDomain(), min = 0, max = 1) {
# A hacky check to make sure the session object is indeed a session object.
if (is.null(session$onFlush)) stop("'session' is not a session object.")
if (!inherits(session, "ShinySession"))
stop("'session' is not a ShinySession object.")
private$session <- session
private$id <- paste(as.character(as.raw(runif(8, min=0, max=255))), collapse='')
@@ -231,8 +231,8 @@ withProgress <- function(expr, min = 0, max = 1,
if (!quoted)
expr <- substitute(expr)
# A hacky check to make sure the session object is indeed a session object.
if (is.null(session$onFlush)) stop("'session' is not a session object.")
if (!inherits(session, "ShinySession"))
stop("'session' is not a ShinySession object.")
p <- Progress$new(session, min = min, max = max)
@@ -252,8 +252,8 @@ withProgress <- function(expr, min = 0, max = 1,
setProgress <- function(value = NULL, message = NULL, detail = NULL,
session = getDefaultReactiveDomain()) {
# A hacky check to make sure the session object is indeed a session object.
if (is.null(session$onFlush)) stop("'session' is not a session object.")
if (!inherits(session, "ShinySession"))
stop("'session' is not a ShinySession object.")
if (session$progressStack$size() == 0) {
warning('setProgress was called outside of withProgress; ignoring')
@@ -269,8 +269,8 @@ setProgress <- function(value = NULL, message = NULL, detail = NULL,
incProgress <- function(amount = 0.1, message = NULL, detail = NULL,
session = getDefaultReactiveDomain()) {
# A hacky check to make sure the session object is indeed a session object.
if (is.null(session$onFlush)) stop("'session' is not a session object.")
if (!inherits(session, "ShinySession"))
stop("'session' is not a ShinySession object.")
if (session$progressStack$size() == 0) {
warning('incProgress was called outside of withProgress; ignoring')

1
R/shiny.R
View File

@@ -225,7 +225,6 @@ NULL
#' @include utils.R
ShinySession <- R6Class(
'ShinySession',
class = FALSE,
private = list(
.websocket = 'ANY',
.invalidatedOutputValues = 'Map',