Merge branch 'master' of github.com:rstudio/revealjs
diff --git a/DESCRIPTION b/DESCRIPTION
index 199637f..ee7afc3 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: revealjs
Type: Package
Title: R Markdown Format for 'reveal.js' Presentations
-Version: 0.6.0.9001
+Version: 0.6.1
Date: 2016-03-08
Authors@R: c(
person("Hakim", "El Hattab", role = c("aut", "cph"),
diff --git a/R/revealjs_presentation.R b/R/revealjs_presentation.R
index 5e50755..541cf3f 100644
--- a/R/revealjs_presentation.R
+++ b/R/revealjs_presentation.R
@@ -18,7 +18,6 @@
#' "convex", "concave" or "zoom")
#' @param background_transition Slide background-transition ("default", "none",
#' "fade", "slide", "convex", "concave" or "zoom")
-#' @param history \code{TRUE} to push each slide change to the browser history.
#' @param reveal_options Additional options to specify for reveal.js (see
#' \href{https://github.com/hakimel/reveal.js#configuration}{https://github.com/hakimel/reveal.js#configuration}
#' for details).
@@ -69,7 +68,6 @@
theme = "simple",
transition = "default",
background_transition = "default",
- history = TRUE,
reveal_options = NULL,
highlight = "default",
mathjax = "default",
@@ -131,8 +129,8 @@
background_transition <- match.arg(background_transition, revealjs_transitions())
args <- c(args, "--variable", paste("backgroundTransition=", background_transition, sep=""))
- # history
- args <- c(args, pandoc_variable_arg("history", jsbool(history)))
+ # use history
+ args <- c(args, pandoc_variable_arg("history", "true"))
# additional reveal options
if (is.list(reveal_options)) {