Add createWebDependency and renderDependencies functions

jcheng5 · jcheng5 · commit 5738a4ba48f7 · 2014-08-18T13:27:55.000-07:00
diff --git a/NAMESPACE b/NAMESPACE
@@ -39,6 +39,7 @@ export(checkboxInput)
 export(code)
 export(column)
 export(conditionalPanel)
+export(createWebDependency)
 export(dataTableOutput)
 export(dateInput)
 export(dateRangeInput)
diff --git a/R/html-deps.R b/R/html-deps.R
@@ -1,3 +1,17 @@
+#' Create a web dependency
+#'
+#' Ensure that a file-based HTML dependency (from the htmltools package) can be
+#' served over Shiny's HTTP server. This function works by using
+#' \code{\link{addResourcePath}} to map the HTML dependency's directory to a
+#' URL.
+#'
+#' @param dependency A single HTML dependency object, created using
+#'   \code{\link{htmlDependency}}. If the \code{src} value is named, then
+#'   \code{href} and/or \code{file} names must be present.
+#'
+#' @return A single HTML dependency object that has an \code{href}-named element
+#'   in its \code{src}.
+#' @export
 createWebDependency <- function(dependency) {
   if (is.null(dependency))
     return(NULL)
diff --git a/inst/www/shared/shiny.js b/inst/www/shared/shiny.js
@@ -37,7 +37,7 @@
     else if (window.getComputedStyle) {
       // getComputedStyle can return null when we're inside a hidden iframe on
       // Firefox; don't attempt to retrieve style props in this case.
-      // https://bugzilla.mozilla.org/show_bug.cgi?id=548397 
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=548397
       var style = document.defaultView.getComputedStyle(el, null);
       if (style)
         x = style.getPropertyValue(styleProp);
@@ -1282,13 +1282,17 @@
   });
   outputBindings.register(htmlOutputBinding, 'shiny.htmlOutput');
 
-  // Render HTML in a DOM element, inserting singletons into head as needed
-  exports.renderHtml = function(html, el, dependencies) {
+  var renderDependencies = exports.renderDependencies = function(dependencies) {
     if (dependencies) {
       $.each(dependencies, function(i, dep) {
         renderDependency(dep);
       });
     }
+  };
+
+  // Render HTML in a DOM element, inserting singletons into head as needed
+  exports.renderHtml = function(html, el, dependencies) {
+    renderDependencies(dependencies)
     return singletons.renderHtml(html, el);
   };
 
@@ -1326,18 +1330,32 @@
     if (dep.stylesheet) {
       var stylesheets = $.map(asArray(dep.stylesheet), function(stylesheet) {
         return $("<link rel='stylesheet' type='text/css'>")
-          .attr("href", href + "/" + stylesheet);
+          .attr("href", href + "/" + escape(stylesheet));
       });
       $head.append(stylesheets);
     }
 
     if (dep.script) {
       var scripts = $.map(asArray(dep.script), function(scriptName) {
-        return $("<script>").attr("src", href + "/" + scriptName);
+        return $("<script>").attr("src", href + "/" + escape(scriptName));
       });
       $head.append(scripts);
     }
 
+    if (dep.attachment) {
+      // dep.attachment might be a single string, an array, or an object.
+      var attachments = dep.attachment;
+      if (typeof(attachments) === "string")
+        attachments = [attachments];
+
+      var attach = $.map(attachments, function(attachment, key) {
+        return $("<link rel='attachment'>")
+          .attr("id", dep.name + "-" + key + "-attachment")
+          .attr("href", href + "/" + escape(attachment));
+      });
+      $head.append(attach);
+    }
+
     if (dep.head) {
       var $newHead = $("<head></head>");
       $newHead.html(dep.head);
diff --git a/man/createWebDependency.Rd b/man/createWebDependency.Rd
@@ -0,0 +1,23 @@
+% Generated by roxygen2 (4.0.1): do not edit by hand
+\name{createWebDependency}
+\alias{createWebDependency}
+\title{Create a web dependency}
+\usage{
+createWebDependency(dependency)
+}
+\arguments{
+\item{dependency}{A single HTML dependency object, created using
+  \code{\link{htmlDependency}}. If the \code{src} value is named, then
+  \code{href} and/or \code{file} names must be present.}
+}
+\value{
+A single HTML dependency object that has an \code{href}-named element
+  in its \code{src}.
+}
+\description{
+Ensure that a file-based HTML dependency (from the htmltools package) can be
+served over Shiny's HTTP server. This function works by using
+\code{\link{addResourcePath}} to map the HTML dependency's directory to a
+URL.
+}
+
