fixes to let other packages to use showOutput.

ramnathv · Jul 8, 2014 · 47e2c06 · 47e2c06
1 parent ebd0fd7
commit 47e2c06
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/R/showOutput.R b/R/showOutput.R
@@ -10,7 +10,7 @@
 chartOutput <- showOutput <- function(outputId, lib = NULL, package = 'rCharts', 
     add_lib = TRUE){
   if (!is.null(lib)){
-    LIB <- get_lib(lib)
+    LIB <- get_lib(lib, package = package)
   } else if (exists(".rChart_object")) {
     LIB <- .rChart_object$LIB
   }

diff --git a/R/utils.R b/R/utils.R
@@ -48,15 +48,15 @@ get_rCharts_assets <- function(lib){
   assets[!grepl('jquery', assets)]
 }
 
-get_lib <- function(lib){
+get_lib <- function(lib, package = 'rCharts'){
   if (grepl("^http", lib)){
     return(list(name = basename(lib), url = lib))
   }
   if (file.exists(lib)){
     lib_url <- normalizePath(lib)
     lib <- basename(lib_url)
   } else {
-    lib_url <- system.file('libraries', lib, package = 'rCharts')
+    lib_url <- system.file('libraries', lib, package = package)
   }
   return(list(name = basename(lib), url = lib_url))
 }