fixed iframe frameborder, height

nachocab · Jul 27, 2013 · 4dc5f7c · 4dc5f7c
1 parent ac302c2
commit 4dc5f7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/R/Chart-helpers.R b/R/Chart-helpers.R
@@ -2,17 +2,19 @@ Chart$methods(
 
     # I can use Mike Bostock's lazy iframes trick by setting "data-src" instead of "src"
     iframe = function(width = params$width + params$padding$right + params$padding$left,
-                      height = params$height + params$padding$top + params$padding$bottom + 4,
+                      height = params$height + params$padding$top + params$padding$bottom + 40,
                       data_src = "src",
+                      frameborder = 0,
                       relative_path = NULL){
 
         url <- get_relative_url(relative_path)
 
-        iframe <- gettextf("<iframe width = \"%d\" height = \"%d\" %s=\"%s\"> </iframe>\n",
+        iframe <- gettextf("<iframe width=\"%d\" height=\"%d\" %s=\"%s\" frameborder=%s> </iframe>\n",
                                width,
                                height,
                                data_src,
-                               url)
+                               url,
+                               frameborder)
 
         cat(iframe)
         .self

diff --git a/tests/testthat/test-Chart-helpers.R b/tests/testthat/test-Chart-helpers.R
@@ -1,4 +1,4 @@
-context("Chart-data")
+context("Chart-helpers")
 
 test_chart_path <- file.path(getOption("clickme_templates_path"), "TestChart")
 unlink(test_chart_path, recursive = TRUE)
@@ -27,10 +27,10 @@ test_that("iframe", {
     test_chart$get_urls()
 
     iframe <- capture.output(test_chart$iframe()$hide())
-    expect_equal(iframe, '<iframe width = "1000" height = "724" src="temp-TestChart.html"> </iframe>')
+    expect_equal(iframe, '<iframe width="1000" height="745" src="temp-TestChart.html" frameborder=0> </iframe>')
 
     iframe <- capture.output(test_chart$iframe(relative_path = "clickme")$hide())
-    expect_equal(iframe, '<iframe width = "1000" height = "724" src="clickme/temp-TestChart.html"> </iframe>')
+    expect_equal(iframe, '<iframe width="1000" height="745" src="clickme/temp-TestChart.html" frameborder=0> </iframe>')
 })
 
 test_that("link", {