Merge remote-tracking branch 'origin/htmltools-refactor'

strategist922 · May 31, 2014 · 1a254d6 · 1a254d6
2 parents 984b0d2 + 3f4ad52
commit 1a254d6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/cpp/session/modules/rmarkdown/SessionRMarkdown.cpp b/src/cpp/session/modules/rmarkdown/SessionRMarkdown.cpp
@@ -203,14 +203,13 @@ class RenderRmd : public async_r::AsyncRProcess
  // options discovered so far in the render_args parameter
  renderOptions = "render_args = list(" + renderOptions + ", "
  "output_options = list(extra_dependencies = "
- "list(structure(list("
+ "list(htmltools::htmlDependency("
  "name = 'rstudio-iframe', "
  "version = '0.1', "
- "path = '" +
+ "src = '" +
  session::options().rResourcesPath().absolutePath() +
  "', "
- "script = 'rsiframe.js'), "
- "class = 'html_dependency'))))";
+ "script = 'rsiframe.js'))))";
  }
 
  // render command

diff --git a/src/gwt/src/org/rstudio/studio/client/common/dependencies/DependencyManager.java b/src/gwt/src/org/rstudio/studio/client/common/dependencies/DependencyManager.java
@@ -113,6 +113,7 @@ public void execute()
  Dependency.cranPackage("RJSONIO", "1.0"),
  Dependency.cranPackage("xtable", "1.7"),
  Dependency.cranPackage("digest", "0.6"),
+ Dependency.cranPackage("htmltools", "0.2.4"),
  Dependency.embeddedPackage("shiny")
  }, 
  command

diff --git a/...o/studio/client/workbench/views/source/editors/text/TextEditingTargetRMarkdownHelper.java b/...o/studio/client/workbench/views/source/editors/text/TextEditingTargetRMarkdownHelper.java
@@ -142,6 +142,7 @@ public void withRMarkdownPackage(
  new Dependency[] {
  Dependency.cranPackage("knitr", "1.6"),
  Dependency.cranPackage("yaml", "2.1.5"),
+ Dependency.cranPackage("htmltools", "0.2.4"),
  Dependency.embeddedPackage("rmarkdown")
  },