Merge branch 'master' of github.com:ropensci/plotly into fix/subplot

Author: cpsievert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via 'plotly.js'
-Version: 3.5.5
+Version: 3.5.7
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Chris", "Parmer", role = c("aut", "cph"),

NEWS

@@ -1,3 +1,19 @@
+3.5.7 -- 13 May 2016
+
+CHANGES:
+
+Better defaults for defaultWidth/defaultHeight in the htmlwidget's sizing policy.
+
+BUG FIX:
+
+Pass knitr options to the named argument options. Fixes #582.
+
+3.5.6 -- 12 May 2016
+
+BUG FIX:
+
+Use .embed suffix in iframe src attribute. Fixes #581.
+
 3.5.5 -- 5 May 2016
 
 CHANGES:

R/print.R

@@ -23,7 +23,7 @@ print.plotly_built <- print.plotly_hash
 #' @export
 knit_print.plotly_hash <- function(x, options, ...) {
   x <- as.widget(x)
-  knitr::knit_print(x, options, ...)
+  knitr::knit_print(x, options = options, ...)
 }
 
 #' Print a 'built' plotly object in a knitr doc
@@ -135,7 +135,7 @@ embed_notebook <- function(x, width = NULL, height = NULL,
 
 plotly_iframe <- function(url = "", width = NULL, height = NULL) {
   sprintf(
-    '<iframe src="%s" width="%s" height="%s" id="igraph" scrolling="no" seamless="seamless" frameBorder="0"> </iframe>', 
+    '<iframe src="%s.embed" width="%s" height="%s" id="igraph" scrolling="no" seamless="seamless" frameBorder="0"> </iframe>', 
     url, width %||% "100%", height %||% "400"
   )
 }