github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-02-02 02:34:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #278 from yihui/changeset/source

Browse Source 
use sys.source() and keep.source=TRUE
This commit is contained in:
Joe Cheng
2013-11-21 13:34:08 -08:00
parent 54b9af0299 c538e9c6d4
commit eaa0bdfc62
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
R/shiny.R
View File

@@ -794,7 +794,7 @@ dynamicHandler <- function(filePath, dependencyFiles=filePath) {
if (file.exists(filePath)) {
local({
cacheContext$with(function() {
source(filePath, local=new.env(parent=.GlobalEnv))
sys.source(filePath, envir=new.env(parent=globalenv()), keep.source=TRUE)
})
})
}
@@ -1048,11 +1048,11 @@ startAppDir <- function(port, host, workerId, quiet) {
stop(paste("server.R file was not found in", getwd()))
if (file.exists(globalR))
source(globalR, local=FALSE)
sys.source(globalR, envir=globalenv(), keep.source=TRUE)
shinyServer(NULL)
serverFileTimestamp <- file.info(serverR)$mtime
local(source(serverR, local=new.env(parent=.GlobalEnv)))
sys.source(serverR, envir=new.env(parent=globalenv()), keep.source=TRUE)
if (is.null(.globals$server))
stop("No server was defined in server.R")
@@ -1062,7 +1062,7 @@ startAppDir <- function(port, host, workerId, quiet) {
if (!identical(mtime, serverFileTimestamp)) {
shinyServer(NULL)
serverFileTimestamp <<- mtime
local(source(serverR, local=new.env(parent=.GlobalEnv)))
sys.source(serverR, envir=new.env(parent=globalenv()), keep.source=TRUE)
if (is.null(.globals$server))
stop("No server was defined in server.R")
}