[med-svn] [r-cran-htmlwidgets] 03/06: New upstream version 0.9
Andreas Tille
tille at debian.org
Tue Oct 10 15:07:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-htmlwidgets.
commit e4a3972ccfc95fb801581edbb2e785c4327e968e
Author: Andreas Tille <tille at debian.org>
Date: Tue Oct 10 17:04:04 2017 +0200
New upstream version 0.9
---
DESCRIPTION | 10 ++--
MD5 | 38 +++++++-------
R/utils.R | 5 +-
build/vignette.rds | Bin 260 -> 258 bytes
inst/NEWS | 11 ++++
inst/doc/develop_advanced.html | 96 ++++++++++++++++++-----------------
inst/doc/develop_intro.html | 112 +++++++++++++++++++++--------------------
inst/doc/develop_sizing.html | 78 ++++++++++++++--------------
inst/www/htmlwidgets.js | 2 +-
man/JS.Rd | 1 -
man/createWidget.Rd | 1 -
man/getDependency.Rd | 1 -
man/htmlwidgets-shiny.Rd | 3 +-
man/onRender.Rd | 1 -
man/onStaticRenderComplete.Rd | 1 -
man/prependContent.Rd | 3 +-
man/saveWidget.Rd | 1 -
man/scaffoldWidget.Rd | 1 -
man/setWidgetIdSeed.Rd | 1 -
man/sizingPolicy.Rd | 1 -
20 files changed, 191 insertions(+), 176 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 5a9724e..b6cd790 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: htmlwidgets
Type: Package
Title: HTML Widgets for R
-Version: 0.8
-Date: 2016-11-09
+Version: 0.9
+Date: 2017-07-10
Authors at R: c(
person("Ramnath", "Vaidyanathan", role = c("aut", "cph")),
person("Yihui", "Xie", role = c("aut")),
@@ -21,9 +21,9 @@ Suggests: knitr (>= 1.8)
Enhances: shiny (>= 0.12)
URL: https://github.com/ramnathv/htmlwidgets
BugReports: https://github.com/ramnathv/htmlwidgets/issues
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
NeedsCompilation: no
-Packaged: 2016-11-09 20:41:12 UTC; jjallaire
+Packaged: 2017-07-10 10:49:02 UTC; jjallaire
Author: Ramnath Vaidyanathan [aut, cph],
Yihui Xie [aut],
JJ Allaire [aut, cre],
@@ -32,4 +32,4 @@ Author: Ramnath Vaidyanathan [aut, cph],
RStudio [cph]
Maintainer: JJ Allaire <jj at rstudio.com>
Repository: CRAN
-Date/Publication: 2016-11-09 23:48:13
+Date/Publication: 2017-07-10 12:42:24 UTC
diff --git a/MD5 b/MD5
index 0bc360c..38f3735 100644
--- a/MD5
+++ b/MD5
@@ -1,4 +1,4 @@
-a91857d8fa3a6bf68ab21da333cd58bc *DESCRIPTION
+a1bcea74946754cab0568ff7f1a6087b *DESCRIPTION
d5e014920944fd879bfd6c3b9d943512 *LICENSE
27ad3bb8893369b9e179fb99f2034ae4 *NAMESPACE
5d40ec402a74a27043d6284c00adb2d8 *R/htmlwidgets.R
@@ -9,33 +9,33 @@ e73b61f39eb5e67d5dd03e7ba998a162 *R/knitr-methods.R
7855788fc6a789530f884750e46e36bf *R/scaffold.R
d41d8cd98f00b204e9800998ecf8427e *R/seed.R
eb659aebd3386aef1e6a7a848d48cb26 *R/sizing.R
-4fa0fea9284213ad9b7cfd657c82c6d7 *R/utils.R
+3cad2286ddaf4962a6e6f6f4db733b76 *R/utils.R
73e905bb777de64e1082024236238431 *R/widgetid.R
-6e2a1cf81f0637c4eb2dff370aa1e52e *build/vignette.rds
-50cb4cdc3576a6a6c58ce54b48eb7c13 *inst/NEWS
+c84f1a017720d9868a6af86c60e1a344 *build/vignette.rds
+ba6b4cfc32f70520ed2af3fd73c168df *inst/NEWS
b0d05e654c9f3175c75491e87233ab47 *inst/doc/develop_advanced.R
f77a13a750cce7eaec6acc820a49ab4b *inst/doc/develop_advanced.Rmd
-d87c1b7662725c265794bb9bd081ff11 *inst/doc/develop_advanced.html
+2ed4315c21cdbc9298c9ba066cca1cd0 *inst/doc/develop_advanced.html
ea858a6de2f9809b7e584d806c18d245 *inst/doc/develop_intro.R
fd0b57315c679845dc5321d0519bfb50 *inst/doc/develop_intro.Rmd
-53f8ce832331080ef3bea7a0f33be524 *inst/doc/develop_intro.html
+15a1231ad9d14c7bd652ce9cd1458ec3 *inst/doc/develop_intro.html
32446f6d3b91105f157004b2a7330507 *inst/doc/develop_sizing.Rmd
-64c6307c306fa40ff70dc19e7ad9a4b2 *inst/doc/develop_sizing.html
+fee6531914a9192fc2476ef9580225b6 *inst/doc/develop_sizing.html
6349641ac577c3e0f6459d53600dafff *inst/templates/widget_js.txt
69d850c68c74097c3a832af2de2e3193 *inst/templates/widget_r.txt
-82172261bc7bdf063eec4fe95f2529e6 *inst/www/htmlwidgets.js
-a03b857226ed22140b03506574ff56d1 *man/JS.Rd
-ce08f3c143431b044b42928528ad0adc *man/createWidget.Rd
-2264197ab32493d53ec0835b1c3d2b6a *man/getDependency.Rd
+e4c32f2be79353a70419462e28373dda *inst/www/htmlwidgets.js
+2d363a23839d53aaa5a4222bb6e905d2 *man/JS.Rd
+f5678740e8f799a70192f561b43fddf8 *man/createWidget.Rd
+ff144f4809f3b3cc263afb136c66ef71 *man/getDependency.Rd
e106fffad1042fb001c4e011eba913ee *man/htmlwidgets-package.Rd
-d96c88940eb097f3b4acde673e35a2a2 *man/htmlwidgets-shiny.Rd
-21ed501c2e102abb0dda660d12fabfb2 *man/onRender.Rd
-88bbe83b0ac92022498b14cb8a9417d3 *man/onStaticRenderComplete.Rd
-1282e2416190142eb838368c96c72a21 *man/prependContent.Rd
-e8dac74a46c488354eb077b3fc922029 *man/saveWidget.Rd
-91e926eea50ddf44c1b283b740951241 *man/scaffoldWidget.Rd
-8e9e5e2938fa86fbf2568a4700fd7440 *man/setWidgetIdSeed.Rd
-9702ebdcb96869c2d384a02814f2736f *man/sizingPolicy.Rd
+cf381206a20ed862e863a9aaa040ed82 *man/htmlwidgets-shiny.Rd
+ece3554c27c73c5ab5231d2ea83448ea *man/onRender.Rd
+80b1ebdb0fdaf53753900fc629f481c0 *man/onStaticRenderComplete.Rd
+c373ec366965592bde33a3c8db87953e *man/prependContent.Rd
+b272c329b5077373b03ad09440f55bf0 *man/saveWidget.Rd
+e2b2558c71ada5e4ad91d19b5fb9db00 *man/scaffoldWidget.Rd
+b23db4a276214b92dede91d150c5a9d6 *man/setWidgetIdSeed.Rd
+3e52745f72b14ef8a11fbb5d641d1f89 *man/sizingPolicy.Rd
f77a13a750cce7eaec6acc820a49ab4b *vignettes/develop_advanced.Rmd
fd0b57315c679845dc5321d0519bfb50 *vignettes/develop_intro.Rmd
32446f6d3b91105f157004b2a7330507 *vignettes/develop_sizing.Rmd
diff --git a/R/utils.R b/R/utils.R
index 4cd2a8a..845c052 100644
--- a/R/utils.R
+++ b/R/utils.R
@@ -141,7 +141,10 @@ JS <- function(...) {
# JavaScript are to be identified
# @author Yihui Xie
JSEvals <- function(list) {
- evals <- names(which(unlist(shouldEval(list))))
+ # the `%||% list()` part is necessary as of R 3.4.0 (April 2017) -- if `evals`
+ # is NULL then `I(evals)` results in a warning in R 3.4.0. This is circumvented
+ # if we let `evals` be equal to `list()` in those cases
+ evals <- names(which(unlist(shouldEval(list)))) %||% list()
I(evals) # need I() to prevent toJSON() from converting it to scalar
}
diff --git a/build/vignette.rds b/build/vignette.rds
index 5b7f854..4842836 100644
Binary files a/build/vignette.rds and b/build/vignette.rds differ
diff --git a/inst/NEWS b/inst/NEWS
index 0b38d00..95a55b3 100644
--- a/inst/NEWS
+++ b/inst/NEWS
@@ -1,3 +1,14 @@
+htmlwidgets 0.9
+-----------------------------------------------------------------------
+
+* Starting with R 3.4.0, a "Calling 'structure(NULL, *)' is deprecated"
+ warning would occur when shinyRenderWidget encountered a NULL value.
+ (#269)
+
+* Fix edge case where using dynamic HTML dependencies from a widget
+ binding's JS factory function would fail.
+
+
htmlwidgets 0.8
-----------------------------------------------------------------------
diff --git a/inst/doc/develop_advanced.html b/inst/doc/develop_advanced.html
index 5e8e9b6..9b13fac 100644
--- a/inst/doc/develop_advanced.html
+++ b/inst/doc/develop_advanced.html
@@ -4,23 +4,23 @@
<head>
-<meta charset="utf-8">
+<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />
-<meta name="date" content="2016-11-09" />
+<meta name="date" content="2017-07-10" />
<title>HTML Widgets: Advanced Topics</title>
<script src="data:application/x-javascript;base64,LyohIGpRdWVyeSB2MS4xMS4zIHwgKGMpIDIwMDUsIDIwMTUgalF1ZXJ5IEZvdW5kYXRpb24sIEluYy4gfCBqcXVlcnkub3JnL2xpY2Vuc2UgKi8KIWZ1bmN0aW9uKGEsYil7Im9iamVjdCI9PXR5cGVvZiBtb2R1bGUmJiJvYmplY3QiPT10eXBlb2YgbW9kdWxlLmV4cG9ydHM/bW9kdWxlLmV4cG9ydHM9YS5kb2N1bWVudD9iKGEsITApOmZ1bmN0aW9uKGEpe2lmKCFhLmRvY3VtZW50KXRocm93IG5ldyBFcnJvcigialF1ZXJ5IHJlcXVpcmVzIGEgd2luZG93IHdpdGggYSBkb2N1bWVudCIpO3JldHVybiBiKGEpfTpiKGEpfSgidW5kZWZpbmVkIiE9dHlwZW9mIHdpbmRvdz93aW5kb3c6dG [...]
<meta name="viewport" content="width=device-width, initial-scale=1" />
-<link href="data:text/css;charset=utf-8,html%7Bfont%2Dfamily%3Asans%2Dserif%3B%2Dwebkit%2Dtext%2Dsize%2Dadjust%3A100%25%3B%2Dms%2Dtext%2Dsize%2Dadjust%3A100%25%7Dbody%7Bmargin%3A0%7Darticle%2Caside%2Cdetails%2Cfigcaption%2Cfigure%2Cfooter%2Cheader%2Chgroup%2Cmain%2Cmenu%2Cnav%2Csection%2Csummary%7Bdisplay%3Ablock%7Daudio%2Ccanvas%2Cprogress%2Cvideo%7Bdisplay%3Ainline%2Dblock%3Bvertical%2Dalign%3Abaseline%7Daudio%3Anot%28%5Bcontrols%5D%29%7Bdisplay%3Anone%3Bheight%3A0%7D%5Bhidden%5D%2Ctem [...]
+<link href="data:text/css;charset=utf-8,html%7Bfont%2Dfamily%3Asans%2Dserif%3B%2Dwebkit%2Dtext%2Dsize%2Dadjust%3A100%25%3B%2Dms%2Dtext%2Dsize%2Dadjust%3A100%25%7Dbody%7Bmargin%3A0%7Darticle%2Caside%2Cdetails%2Cfigcaption%2Cfigure%2Cfooter%2Cheader%2Chgroup%2Cmain%2Cmenu%2Cnav%2Csection%2Csummary%7Bdisplay%3Ablock%7Daudio%2Ccanvas%2Cprogress%2Cvideo%7Bdisplay%3Ainline%2Dblock%3Bvertical%2Dalign%3Abaseline%7Daudio%3Anot%28%5Bcontrols%5D%29%7Bdisplay%3Anone%3Bheight%3A0%7D%5Bhidden%5D%2Ctem [...]
<script src="data:application/x-javascript;base64,LyohCiAqIEJvb3RzdHJhcCB2My4zLjUgKGh0dHA6Ly9nZXRib290c3RyYXAuY29tKQogKiBDb3B5cmlnaHQgMjAxMS0yMDE1IFR3aXR0ZXIsIEluYy4KICogTGljZW5zZWQgdW5kZXIgdGhlIE1JVCBsaWNlbnNlCiAqLwppZigidW5kZWZpbmVkIj09dHlwZW9mIGpRdWVyeSl0aHJvdyBuZXcgRXJyb3IoIkJvb3RzdHJhcCdzIEphdmFTY3JpcHQgcmVxdWlyZXMgalF1ZXJ5Iik7K2Z1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0Ijt2YXIgYj1hLmZuLmpxdWVyeS5zcGxpdCgiICIpWzBdLnNwbGl0KCIuIik7aWYoYlswXTwyJiZiWzFdPDl8fDE9PWJbMF0mJjk9PWJbMV0mJmJbMl08MSl0aHJvdy [...]
<script src="data:application/x-javascript;base64,LyoqCiogQHByZXNlcnZlIEhUTUw1IFNoaXYgMy43LjIgfCBAYWZhcmthcyBAamRhbHRvbiBAam9uX25lYWwgQHJlbSB8IE1JVC9HUEwyIExpY2Vuc2VkCiovCi8vIE9ubHkgcnVuIHRoaXMgY29kZSBpbiBJRSA4CmlmICghIXdpbmRvdy5uYXZpZ2F0b3IudXNlckFnZW50Lm1hdGNoKCJNU0lFIDgiKSkgewohZnVuY3Rpb24oYSxiKXtmdW5jdGlvbiBjKGEsYil7dmFyIGM9YS5jcmVhdGVFbGVtZW50KCJwIiksZD1hLmdldEVsZW1lbnRzQnlUYWdOYW1lKCJoZWFkIilbMF18fGEuZG9jdW1lbnRFbGVtZW50O3JldHVybiBjLmlubmVySFRNTD0ieDxzdHlsZT4iK2IrIjwvc3R5bGU+IixkLm [...]
<script src="data:application/x-javascript;base64,LyohIFJlc3BvbmQuanMgdjEuNC4yOiBtaW4vbWF4LXdpZHRoIG1lZGlhIHF1ZXJ5IHBvbHlmaWxsICogQ29weXJpZ2h0IDIwMTMgU2NvdHQgSmVobAogKiBMaWNlbnNlZCB1bmRlciBodHRwczovL2dpdGh1Yi5jb20vc2NvdHRqZWhsL1Jlc3BvbmQvYmxvYi9tYXN0ZXIvTElDRU5TRS1NSVQKICogICovCgovLyBPbmx5IHJ1biB0aGlzIGNvZGUgaW4gSUUgOAppZiAoISF3aW5kb3cubmF2aWdhdG9yLnVzZXJBZ2VudC5tYXRjaCgiTVNJRSA4IikpIHsKIWZ1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0IjthLm1hdGNoTWVkaWE9YS5tYXRjaE1lZGlhfHxmdW5jdGlvbihhKXt2YXIgYixjPWEuZG [...]
-<script src="data:application/x-javascript;base64,Cgp3aW5kb3cuYnVpbGRUYWJzZXRzID0gZnVuY3Rpb24odG9jSUQpIHsKCiAgLy8gYnVpbGQgYSB0YWJzZXQgZnJvbSBhIHNlY3Rpb24gZGl2IHdpdGggdGhlIC50YWJzZXQgY2xhc3MKICBmdW5jdGlvbiBidWlsZFRhYnNldCh0YWJzZXQpIHsKCiAgICAvLyBjaGVjayBmb3IgZmFkZSBhbmQgcGlsbHMgb3B0aW9ucwogICAgdmFyIGZhZGUgPSB0YWJzZXQuaGFzQ2xhc3MoInRhYnNldC1mYWRlIik7CiAgICB2YXIgcGlsbHMgPSB0YWJzZXQuaGFzQ2xhc3MoInRhYnNldC1waWxscyIpOwogICAgdmFyIG5hdkNsYXNzID0gcGlsbHMgPyAibmF2LXBpbGxzIiA6ICJuYXYtdGFicyI7CgogIC [...]
+<script src="data:application/x-javascript;base64,CgovKioKICogalF1ZXJ5IFBsdWdpbjogU3RpY2t5IFRhYnMKICoKICogQGF1dGhvciBBaWRhbiBMaXN0ZXIgPGFpZGFuQHBocC5uZXQ+CiAqIGFkYXB0ZWQgYnkgUnViZW4gQXJzbGFuIHRvIGFjdGl2YXRlIHBhcmVudCB0YWJzIHRvbwogKiBodHRwOi8vd3d3LmFpZGFubGlzdGVyLmNvbS8yMDE0LzAzL3BlcnNpc3RpbmctdGhlLXRhYi1zdGF0ZS1pbi1ib290c3RyYXAvCiAqLwooZnVuY3Rpb24oJCkgewogICJ1c2Ugc3RyaWN0IjsKICAkLmZuLnJtYXJrZG93blN0aWNreVRhYnMgPSBmdW5jdGlvbigpIHsKICAgIHZhciBjb250ZXh0ID0gdGhpczsKICAgIC8vIFNob3cgdGhlIHRhYi [...]
<style type="text/css">code{white-space: pre;}</style>
@@ -28,37 +28,41 @@
div.sourceCode { overflow-x: auto; }
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
margin: 0; padding: 0; vertical-align: baseline; border: none; }
-table.sourceCode { width: 100%; line-height: 100%; }
-td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; background-color: #dddddd; }
+table.sourceCode { width: 100%; line-height: 100%; background-color: #ffffff; color: #1f1c1b; }
+td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; background-color: #ffffff; color: #a0a0a0; border-right: 1px solid #a0a0a0; }
td.sourceCode { padding-left: 5px; }
-code > span.kw { font-weight: bold; } /* Keyword */
-code > span.dt { color: #800000; } /* DataType */
-code > span.dv { color: #0000ff; } /* DecVal */
-code > span.bn { color: #0000ff; } /* BaseN */
-code > span.fl { color: #800080; } /* Float */
-code > span.ch { color: #ff00ff; } /* Char */
-code > span.st { color: #dd0000; } /* String */
-code > span.co { color: #808080; font-style: italic; } /* Comment */
-code > span.al { color: #00ff00; font-weight: bold; } /* Alert */
-code > span.fu { color: #000080; } /* Function */
-code > span.er { color: #ff0000; font-weight: bold; } /* Error */
-code > span.wa { color: #ff0000; font-weight: bold; } /* Warning */
-code > span.cn { color: #000000; } /* Constant */
-code > span.sc { color: #ff00ff; } /* SpecialChar */
-code > span.vs { color: #dd0000; } /* VerbatimString */
-code > span.ss { color: #dd0000; } /* SpecialString */
-code > span.im { } /* Import */
-code > span.va { } /* Variable */
-code > span.cf { } /* ControlFlow */
-code > span.op { } /* Operator */
-code > span.bu { } /* BuiltIn */
-code > span.ex { } /* Extension */
-code > span.pp { font-weight: bold; } /* Preprocessor */
-code > span.at { } /* Attribute */
-code > span.do { color: #808080; font-style: italic; } /* Documentation */
-code > span.an { color: #808080; font-weight: bold; font-style: italic; } /* Annotation */
-code > span.cv { color: #808080; font-weight: bold; font-style: italic; } /* CommentVar */
-code > span.in { color: #808080; font-weight: bold; font-style: italic; } /* Information */
+pre, code { color: #1f1c1b; background-color: #ffffff; }
+code > span.kw { color: #1f1c1b; font-weight: bold; } /* Keyword */
+code > span.dt { color: #0057ae; } /* DataType */
+code > span.dv { color: #b08000; } /* DecVal */
+code > span.bn { color: #b08000; } /* BaseN */
+code > span.fl { color: #b08000; } /* Float */
+code > span.cn { color: #aa5500; } /* Constant */
+code > span.ch { color: #924c9d; } /* Char */
+code > span.sc { color: #3daee9; } /* SpecialChar */
+code > span.st { color: #bf0303; } /* String */
+code > span.vs { color: #bf0303; } /* VerbatimString */
+code > span.ss { color: #ff5500; } /* SpecialString */
+code > span.im { color: #ff5500; } /* Import */
+code > span.co { color: #898887; } /* Comment */
+code > span.do { color: #607880; } /* Documentation */
+code > span.an { color: #ca60ca; } /* Annotation */
+code > span.cv { color: #0095ff; } /* CommentVar */
+code > span.ot { color: #006e28; } /* Other */
+code > span.fu { color: #644a9b; } /* Function */
+code > span.va { color: #0057ae; } /* Variable */
+code > span.cf { color: #1f1c1b; font-weight: bold; } /* ControlFlow */
+code > span.op { color: #1f1c1b; } /* Operator */
+code > span.bu { color: #644a9b; font-weight: bold; } /* BuiltIn */
+code > span.ex { color: #0095ff; font-weight: bold; } /* Extension */
+code > span.pp { color: #006e28; } /* Preprocessor */
+code > span.at { color: #0057ae; } /* Attribute */
+code > span.re { color: #0057ae; } /* RegionMarker */
+code > span.in { color: #b08000; } /* Information */
+code > span.wa { color: #bf0303; } /* Warning */
+code > span.al { color: #bf0303; font-weight: bold; } /* Alert */
+code > span.er { color: #bf0303; text-decoration: underline; } /* Error */
+code > span. { color: #1f1c1b; } /* Normal */
</style>
<style type="text/css">
pre:not([class]) {
@@ -144,7 +148,7 @@ $(document).ready(function () {
<h1 class="title toc-ignore">HTML Widgets: Advanced Topics</h1>
-<h4 class="date"><em>2016-11-09</em></h4>
+<h4 class="date"><em>2017-07-10</em></h4>
</div>
@@ -256,44 +260,44 @@ $(document).ready(function () {
<p>You may find it necessary to customize the JSON serialization of widget data when the default serializer in <strong>htmlwidgets</strong> does not work in the way you have expected. For widget package authors, there are two levels of customization for the JSON serialization: you can either customize the default values of arguments for <code>jsonlite::toJSON()</code>, or just customize the whole function.</p>
<ol style="list-style-type: decimal">
<li><p><code>jsonlite::toJSON()</code> has a lot of arguments, and we have already changed some of its default values. Below is the JSON serializer we use in <strong>htmlwidgets</strong> at the moment:</p>
-<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">function (x, ..., <span class="dt">dataframe =</span> <span class="st">"columns"</span>, <span class="dt">null =</span> <span class="st">"null"</span>, <span class="dt">na =</span> <span class="st">"null"</span>,
+<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="cf">function</span> (x, ..., <span class="dt">dataframe =</span> <span class="st">"columns"</span>, <span class="dt">null =</span> <span class="st">"null"</span>, <span class="dt">na =</span> <span class="st">"null"</span>,
<span class="dt">auto_unbox =</span> <span class="ot">TRUE</span>, <span class="dt">digits =</span> <span class="kw">getOption</span>(<span class="st">"shiny.json.digits"</span>,
<span class="dv">16</span>), <span class="dt">use_signif =</span> <span class="ot">TRUE</span>, <span class="dt">force =</span> <span class="ot">TRUE</span>, <span class="dt">POSIXt =</span> <span class="st">"ISO8601"</span>,
<span class="dt">UTC =</span> <span class="ot">TRUE</span>, <span class="dt">rownames =</span> <span class="ot">FALSE</span>, <span class="dt">keep_vec_names =</span> <span class="ot">TRUE</span>, <span class="dt">strict_atomic =</span> <span class="ot">TRUE</span>)
{
- if (strict_atomic)
+ <span class="cf">if</span> (strict_atomic)
x <-<span class="st"> </span><span class="kw">I</span>(x)
- jsonlite::<span class="kw">toJSON</span>(x, <span class="dt">dataframe =</span> dataframe, <span class="dt">null =</span> null, <span class="dt">na =</span> na,
+ jsonlite<span class="op">::</span><span class="kw">toJSON</span>(x, <span class="dt">dataframe =</span> dataframe, <span class="dt">null =</span> null, <span class="dt">na =</span> na,
<span class="dt">auto_unbox =</span> auto_unbox, <span class="dt">digits =</span> digits, <span class="dt">use_signif =</span> use_signif,
<span class="dt">force =</span> force, <span class="dt">POSIXt =</span> POSIXt, <span class="dt">UTC =</span> UTC, <span class="dt">rownames =</span> rownames,
<span class="dt">keep_vec_names =</span> keep_vec_names, <span class="dt">json_verbatim =</span> <span class="ot">TRUE</span>,
...)
}</code></pre></div>
<p>For example, we convert data frames to JSON by columns instead of rows (the latter is <code>jsonlite::toJSON</code>’s default). If you want to change the default values of any arguments, you can attach an attribute <code>TOJSON_ARGS</code> to the widget data to be passed to <code>createWidget()</code>, e.g.</p>
-<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">fooWidget <-<span class="st"> </span>function(data, name, ...) {
+<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">fooWidget <-<span class="st"> </span><span class="cf">function</span>(data, name, ...) {
<span class="co"># ... process the data ...</span>
params <-<span class="st"> </span><span class="kw">list</span>(<span class="dt">foo =</span> data, <span class="dt">bar =</span> <span class="ot">TRUE</span>)
<span class="co"># customize toJSON() argument values</span>
<span class="kw">attr</span>(params, <span class="st">'TOJSON_ARGS'</span>) <-<span class="st"> </span><span class="kw">list</span>(<span class="dt">digits =</span> <span class="dv">7</span>, <span class="dt">na =</span> <span class="st">'string'</span>)
- htmlwidgets::<span class="kw">createWidget</span>(name, <span class="dt">x =</span> params, ...)
+ htmlwidgets<span class="op">::</span><span class="kw">createWidget</span>(name, <span class="dt">x =</span> params, ...)
}</code></pre></div>
<p>We changed the default value of <code>digits</code> from 16 to 7, and <code>na</code> from <code>null</code> to <code>string</code> in the above example. It is up to you, the package author, whether you want to expose such customization to users. For example, you can leave an extra argument in your widget function so that users can customize the behavior of the JSON serializer:</p>
-<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">fooWidget <-<span class="st"> </span>function(data, name, ..., <span class="dt">JSONArgs =</span> <span class="kw">list</span>(<span class="dt">digits =</span> <span class="dv">7</span>)) {
+<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">fooWidget <-<span class="st"> </span><span class="cf">function</span>(data, name, ..., <span class="dt">JSONArgs =</span> <span class="kw">list</span>(<span class="dt">digits =</span> <span class="dv">7</span>)) {
<span class="co"># ... process the data ...</span>
params <-<span class="st"> </span><span class="kw">list</span>(<span class="dt">foo =</span> data, <span class="dt">bar =</span> <span class="ot">TRUE</span>)
<span class="co"># customize toJSON() argument values</span>
<span class="kw">attr</span>(params, <span class="st">'TOJSON_ARGS'</span>) <-<span class="st"> </span>JSONArgs
- htmlwidgets::<span class="kw">createWidget</span>(name, <span class="dt">x =</span> params, ...)
+ htmlwidgets<span class="op">::</span><span class="kw">createWidget</span>(name, <span class="dt">x =</span> params, ...)
}</code></pre></div>
<p>You can also use a global option <code>htmlwidgets.TOJSON_ARGS</code> to customize the JSON serializer arguments for all widgets in the current R session, e.g.</p>
<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">options</span>(<span class="dt">htmlwidgets.TOJSON_ARGS =</span> <span class="kw">list</span>(<span class="dt">digits =</span> <span class="dv">7</span>, <span class="dt">pretty =</span> <span class="ot">TRUE</span>))</code></pre></div></li>
<li><p>If you do not want to use <strong>jsonlite</strong>, you can completely override the serializer function by attaching an attribute <code>TOJSON_FUNC</code> to the widget data, e.g.</p>
-<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">fooWidget <-<span class="st"> </span>function(data, name, ...) {
+<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">fooWidget <-<span class="st"> </span><span class="cf">function</span>(data, name, ...) {
<span class="co"># ... process the data ...</span>
params <-<span class="st"> </span><span class="kw">list</span>(<span class="dt">foo =</span> data, <span class="dt">bar =</span> <span class="ot">TRUE</span>)
<span class="co"># customize the JSON serializer</span>
<span class="kw">attr</span>(params, <span class="st">'TOJSON_FUNC'</span>) <-<span class="st"> </span>MY_OWN_JSON_FUNCTION
- htmlwidgets::<span class="kw">createWidget</span>(name, <span class="dt">x =</span> params, ...)
+ htmlwidgets<span class="op">::</span><span class="kw">createWidget</span>(name, <span class="dt">x =</span> params, ...)
}</code></pre></div>
<p>Here <code>MY_OWN_JSON_FUNCTION</code> can be an arbitrary R function that converts R objects to JSON. If you have also specified the <code>TOJSON_ARGS</code> attribute, it will be passed to your custom JSON function as well.</p></li>
</ol>
@@ -323,8 +327,8 @@ $(document).ready(function () {
<div id="custom-widget-html" class="section level2">
<h2>Custom widget HTML</h2>
<p>Typically the HTML “housing” for a widget is just a <code><div></code> element, and this is correspondingly the default behavior for new widgets that don’t specify otherwise. However, sometimes you need a different element type. For example, the <a href="https://github.com/htmlwidgets/sparkline">sparkline</a> widget requires a <code><span></code> element so implements the following custom HTML generation function:</p>
-<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">sparkline_html <-<span class="st"> </span>function(id, style, class, ...){
- tags$<span class="kw">span</span>(<span class="dt">id =</span> id, <span class="dt">class =</span> class)
+<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">sparkline_html <-<span class="st"> </span><span class="cf">function</span>(id, style, class, ...){
+ tags<span class="op">$</span><span class="kw">span</span>(<span class="dt">id =</span> id, <span class="dt">class =</span> class)
}</code></pre></div>
<p>Note that this function is looked up within the package implementing the widget by the convention <code>widgetname_html</code> so it need not be formally exported from your package or otherwise registered with <strong>htmlwidgets</strong>.</p>
<p>Most widgets won’t need a custom HTML function but if you need to generate custom HTML for your widget (e.g. you need an <code><input></code> or a <code><span></code> rather than a <code><div></code>) then you should use the <strong>htmltools</strong> package (as demonstrated by the code above).</p>
diff --git a/inst/doc/develop_intro.html b/inst/doc/develop_intro.html
index 4a433d6..63556ed 100644
--- a/inst/doc/develop_intro.html
+++ b/inst/doc/develop_intro.html
@@ -4,23 +4,23 @@
<head>
-<meta charset="utf-8">
+<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />
-<meta name="date" content="2016-11-09" />
+<meta name="date" content="2017-07-10" />
<title>Introduction to HTML Widgets</title>
<script src="data:application/x-javascript;base64,LyohIGpRdWVyeSB2MS4xMS4zIHwgKGMpIDIwMDUsIDIwMTUgalF1ZXJ5IEZvdW5kYXRpb24sIEluYy4gfCBqcXVlcnkub3JnL2xpY2Vuc2UgKi8KIWZ1bmN0aW9uKGEsYil7Im9iamVjdCI9PXR5cGVvZiBtb2R1bGUmJiJvYmplY3QiPT10eXBlb2YgbW9kdWxlLmV4cG9ydHM/bW9kdWxlLmV4cG9ydHM9YS5kb2N1bWVudD9iKGEsITApOmZ1bmN0aW9uKGEpe2lmKCFhLmRvY3VtZW50KXRocm93IG5ldyBFcnJvcigialF1ZXJ5IHJlcXVpcmVzIGEgd2luZG93IHdpdGggYSBkb2N1bWVudCIpO3JldHVybiBiKGEpfTpiKGEpfSgidW5kZWZpbmVkIiE9dHlwZW9mIHdpbmRvdz93aW5kb3c6dG [...]
<meta name="viewport" content="width=device-width, initial-scale=1" />
-<link href="data:text/css;charset=utf-8,html%7Bfont%2Dfamily%3Asans%2Dserif%3B%2Dwebkit%2Dtext%2Dsize%2Dadjust%3A100%25%3B%2Dms%2Dtext%2Dsize%2Dadjust%3A100%25%7Dbody%7Bmargin%3A0%7Darticle%2Caside%2Cdetails%2Cfigcaption%2Cfigure%2Cfooter%2Cheader%2Chgroup%2Cmain%2Cmenu%2Cnav%2Csection%2Csummary%7Bdisplay%3Ablock%7Daudio%2Ccanvas%2Cprogress%2Cvideo%7Bdisplay%3Ainline%2Dblock%3Bvertical%2Dalign%3Abaseline%7Daudio%3Anot%28%5Bcontrols%5D%29%7Bdisplay%3Anone%3Bheight%3A0%7D%5Bhidden%5D%2Ctem [...]
+<link href="data:text/css;charset=utf-8,html%7Bfont%2Dfamily%3Asans%2Dserif%3B%2Dwebkit%2Dtext%2Dsize%2Dadjust%3A100%25%3B%2Dms%2Dtext%2Dsize%2Dadjust%3A100%25%7Dbody%7Bmargin%3A0%7Darticle%2Caside%2Cdetails%2Cfigcaption%2Cfigure%2Cfooter%2Cheader%2Chgroup%2Cmain%2Cmenu%2Cnav%2Csection%2Csummary%7Bdisplay%3Ablock%7Daudio%2Ccanvas%2Cprogress%2Cvideo%7Bdisplay%3Ainline%2Dblock%3Bvertical%2Dalign%3Abaseline%7Daudio%3Anot%28%5Bcontrols%5D%29%7Bdisplay%3Anone%3Bheight%3A0%7D%5Bhidden%5D%2Ctem [...]
<script src="data:application/x-javascript;base64,LyohCiAqIEJvb3RzdHJhcCB2My4zLjUgKGh0dHA6Ly9nZXRib290c3RyYXAuY29tKQogKiBDb3B5cmlnaHQgMjAxMS0yMDE1IFR3aXR0ZXIsIEluYy4KICogTGljZW5zZWQgdW5kZXIgdGhlIE1JVCBsaWNlbnNlCiAqLwppZigidW5kZWZpbmVkIj09dHlwZW9mIGpRdWVyeSl0aHJvdyBuZXcgRXJyb3IoIkJvb3RzdHJhcCdzIEphdmFTY3JpcHQgcmVxdWlyZXMgalF1ZXJ5Iik7K2Z1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0Ijt2YXIgYj1hLmZuLmpxdWVyeS5zcGxpdCgiICIpWzBdLnNwbGl0KCIuIik7aWYoYlswXTwyJiZiWzFdPDl8fDE9PWJbMF0mJjk9PWJbMV0mJmJbMl08MSl0aHJvdy [...]
<script src="data:application/x-javascript;base64,LyoqCiogQHByZXNlcnZlIEhUTUw1IFNoaXYgMy43LjIgfCBAYWZhcmthcyBAamRhbHRvbiBAam9uX25lYWwgQHJlbSB8IE1JVC9HUEwyIExpY2Vuc2VkCiovCi8vIE9ubHkgcnVuIHRoaXMgY29kZSBpbiBJRSA4CmlmICghIXdpbmRvdy5uYXZpZ2F0b3IudXNlckFnZW50Lm1hdGNoKCJNU0lFIDgiKSkgewohZnVuY3Rpb24oYSxiKXtmdW5jdGlvbiBjKGEsYil7dmFyIGM9YS5jcmVhdGVFbGVtZW50KCJwIiksZD1hLmdldEVsZW1lbnRzQnlUYWdOYW1lKCJoZWFkIilbMF18fGEuZG9jdW1lbnRFbGVtZW50O3JldHVybiBjLmlubmVySFRNTD0ieDxzdHlsZT4iK2IrIjwvc3R5bGU+IixkLm [...]
<script src="data:application/x-javascript;base64,LyohIFJlc3BvbmQuanMgdjEuNC4yOiBtaW4vbWF4LXdpZHRoIG1lZGlhIHF1ZXJ5IHBvbHlmaWxsICogQ29weXJpZ2h0IDIwMTMgU2NvdHQgSmVobAogKiBMaWNlbnNlZCB1bmRlciBodHRwczovL2dpdGh1Yi5jb20vc2NvdHRqZWhsL1Jlc3BvbmQvYmxvYi9tYXN0ZXIvTElDRU5TRS1NSVQKICogICovCgovLyBPbmx5IHJ1biB0aGlzIGNvZGUgaW4gSUUgOAppZiAoISF3aW5kb3cubmF2aWdhdG9yLnVzZXJBZ2VudC5tYXRjaCgiTVNJRSA4IikpIHsKIWZ1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0IjthLm1hdGNoTWVkaWE9YS5tYXRjaE1lZGlhfHxmdW5jdGlvbihhKXt2YXIgYixjPWEuZG [...]
-<script src="data:application/x-javascript;base64,Cgp3aW5kb3cuYnVpbGRUYWJzZXRzID0gZnVuY3Rpb24odG9jSUQpIHsKCiAgLy8gYnVpbGQgYSB0YWJzZXQgZnJvbSBhIHNlY3Rpb24gZGl2IHdpdGggdGhlIC50YWJzZXQgY2xhc3MKICBmdW5jdGlvbiBidWlsZFRhYnNldCh0YWJzZXQpIHsKCiAgICAvLyBjaGVjayBmb3IgZmFkZSBhbmQgcGlsbHMgb3B0aW9ucwogICAgdmFyIGZhZGUgPSB0YWJzZXQuaGFzQ2xhc3MoInRhYnNldC1mYWRlIik7CiAgICB2YXIgcGlsbHMgPSB0YWJzZXQuaGFzQ2xhc3MoInRhYnNldC1waWxscyIpOwogICAgdmFyIG5hdkNsYXNzID0gcGlsbHMgPyAibmF2LXBpbGxzIiA6ICJuYXYtdGFicyI7CgogIC [...]
+<script src="data:application/x-javascript;base64,CgovKioKICogalF1ZXJ5IFBsdWdpbjogU3RpY2t5IFRhYnMKICoKICogQGF1dGhvciBBaWRhbiBMaXN0ZXIgPGFpZGFuQHBocC5uZXQ+CiAqIGFkYXB0ZWQgYnkgUnViZW4gQXJzbGFuIHRvIGFjdGl2YXRlIHBhcmVudCB0YWJzIHRvbwogKiBodHRwOi8vd3d3LmFpZGFubGlzdGVyLmNvbS8yMDE0LzAzL3BlcnNpc3RpbmctdGhlLXRhYi1zdGF0ZS1pbi1ib290c3RyYXAvCiAqLwooZnVuY3Rpb24oJCkgewogICJ1c2Ugc3RyaWN0IjsKICAkLmZuLnJtYXJrZG93blN0aWNreVRhYnMgPSBmdW5jdGlvbigpIHsKICAgIHZhciBjb250ZXh0ID0gdGhpczsKICAgIC8vIFNob3cgdGhlIHRhYi [...]
<style type="text/css">code{white-space: pre;}</style>
@@ -28,37 +28,41 @@
div.sourceCode { overflow-x: auto; }
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
margin: 0; padding: 0; vertical-align: baseline; border: none; }
-table.sourceCode { width: 100%; line-height: 100%; }
-td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; background-color: #dddddd; }
+table.sourceCode { width: 100%; line-height: 100%; background-color: #ffffff; color: #1f1c1b; }
+td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; background-color: #ffffff; color: #a0a0a0; border-right: 1px solid #a0a0a0; }
td.sourceCode { padding-left: 5px; }
-code > span.kw { font-weight: bold; } /* Keyword */
-code > span.dt { color: #800000; } /* DataType */
-code > span.dv { color: #0000ff; } /* DecVal */
-code > span.bn { color: #0000ff; } /* BaseN */
-code > span.fl { color: #800080; } /* Float */
-code > span.ch { color: #ff00ff; } /* Char */
-code > span.st { color: #dd0000; } /* String */
-code > span.co { color: #808080; font-style: italic; } /* Comment */
-code > span.al { color: #00ff00; font-weight: bold; } /* Alert */
-code > span.fu { color: #000080; } /* Function */
-code > span.er { color: #ff0000; font-weight: bold; } /* Error */
-code > span.wa { color: #ff0000; font-weight: bold; } /* Warning */
-code > span.cn { color: #000000; } /* Constant */
-code > span.sc { color: #ff00ff; } /* SpecialChar */
-code > span.vs { color: #dd0000; } /* VerbatimString */
-code > span.ss { color: #dd0000; } /* SpecialString */
-code > span.im { } /* Import */
-code > span.va { } /* Variable */
-code > span.cf { } /* ControlFlow */
-code > span.op { } /* Operator */
-code > span.bu { } /* BuiltIn */
-code > span.ex { } /* Extension */
-code > span.pp { font-weight: bold; } /* Preprocessor */
-code > span.at { } /* Attribute */
-code > span.do { color: #808080; font-style: italic; } /* Documentation */
-code > span.an { color: #808080; font-weight: bold; font-style: italic; } /* Annotation */
-code > span.cv { color: #808080; font-weight: bold; font-style: italic; } /* CommentVar */
-code > span.in { color: #808080; font-weight: bold; font-style: italic; } /* Information */
+pre, code { color: #1f1c1b; background-color: #ffffff; }
+code > span.kw { color: #1f1c1b; font-weight: bold; } /* Keyword */
+code > span.dt { color: #0057ae; } /* DataType */
+code > span.dv { color: #b08000; } /* DecVal */
+code > span.bn { color: #b08000; } /* BaseN */
+code > span.fl { color: #b08000; } /* Float */
+code > span.cn { color: #aa5500; } /* Constant */
+code > span.ch { color: #924c9d; } /* Char */
+code > span.sc { color: #3daee9; } /* SpecialChar */
+code > span.st { color: #bf0303; } /* String */
+code > span.vs { color: #bf0303; } /* VerbatimString */
+code > span.ss { color: #ff5500; } /* SpecialString */
+code > span.im { color: #ff5500; } /* Import */
+code > span.co { color: #898887; } /* Comment */
+code > span.do { color: #607880; } /* Documentation */
+code > span.an { color: #ca60ca; } /* Annotation */
+code > span.cv { color: #0095ff; } /* CommentVar */
+code > span.ot { color: #006e28; } /* Other */
+code > span.fu { color: #644a9b; } /* Function */
+code > span.va { color: #0057ae; } /* Variable */
+code > span.cf { color: #1f1c1b; font-weight: bold; } /* ControlFlow */
+code > span.op { color: #1f1c1b; } /* Operator */
+code > span.bu { color: #644a9b; font-weight: bold; } /* BuiltIn */
+code > span.ex { color: #0095ff; font-weight: bold; } /* Extension */
+code > span.pp { color: #006e28; } /* Preprocessor */
+code > span.at { color: #0057ae; } /* Attribute */
+code > span.re { color: #0057ae; } /* RegionMarker */
+code > span.in { color: #b08000; } /* Information */
+code > span.wa { color: #bf0303; } /* Warning */
+code > span.al { color: #bf0303; font-weight: bold; } /* Alert */
+code > span.er { color: #bf0303; text-decoration: underline; } /* Error */
+code > span. { color: #1f1c1b; } /* Normal */
</style>
<style type="text/css">
pre:not([class]) {
@@ -144,7 +148,7 @@ $(document).ready(function () {
<h1 class="title toc-ignore">Introduction to HTML Widgets</h1>
-<h4 class="date"><em>2016-11-09</em></h4>
+<h4 class="date"><em>2017-07-10</em></h4>
</div>
@@ -217,10 +221,10 @@ inst/
<h3>Dependencies</h3>
<p>Dependencies are the JavaScript and CSS assets used by a widget. Dependencies are included within the <code>inst/htmlwidgets/lib</code> directory. Dependencies are specified using a YAML configuration file which uses the name of the widget as its base file name. Here’s what our <strong>sigma.yaml</strong> file looks like:</p>
<div class="sourceCode"><pre class="sourceCode yaml"><code class="sourceCode yaml"><span class="fu">dependencies:</span>
- <span class="kw">-</span> <span class="fu">name:</span> sigma
- <span class="fu">version:</span> 1.0.3
- <span class="fu">src:</span> htmlwidgets/lib/sigma-1.0.3
- <span class="fu">script:</span>
+ <span class="kw">-</span> <span class="fu">name:</span><span class="at"> sigma</span>
+ <span class="fu">version:</span><span class="at"> 1.0.3</span>
+ <span class="fu">src:</span><span class="at"> htmlwidgets/lib/sigma-1.0.3</span>
+ <span class="fu">script:</span><span class="at"> </span>
<span class="kw">-</span> sigma.min.js
<span class="kw">-</span> plugins/sigma.parsers.gexf.min.js</code></pre></div>
<p>The dependency <code>src</code> specification refers to the directory that contains the library and <code>script</code> refers to specific JavaScript files. If your library contains multiple JavaScript files specify each one on a line beginning with <code>-</code> as shown here. You can also add <code>stylesheet</code> entries and even <code>meta</code> or <code>head</code> entries. Multiple dependencies may be specified in one YAML file. See the documentation on the <code>htmlDepende [...]
@@ -230,7 +234,7 @@ inst/
<p>We need to provide users with an R function that invokes our widget. Typically this function will accept input data as well as various options that control the widget’s display. Here’s the R function for <code>sigma</code>:</p>
<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="co">#' @import htmlwidgets</span>
<span class="co">#' @export</span>
-sigma <-<span class="st"> </span>function(gexf, <span class="dt">drawEdges =</span> <span class="ot">TRUE</span>, <span class="dt">drawNodes =</span> <span class="ot">TRUE</span>,
+sigma <-<span class="st"> </span><span class="cf">function</span>(gexf, <span class="dt">drawEdges =</span> <span class="ot">TRUE</span>, <span class="dt">drawNodes =</span> <span class="ot">TRUE</span>,
<span class="dt">width =</span> <span class="ot">NULL</span>, <span class="dt">height =</span> <span class="ot">NULL</span>) {
<span class="co"># read the gexf file</span>
@@ -249,18 +253,18 @@ sigma <-<span class="st"> </span>function(gexf, <span class="dt">drawEdges =<
)
<span class="co"># create the widget</span>
- htmlwidgets::<span class="kw">createWidget</span>(<span class="st">"sigma"</span>, x, <span class="dt">width =</span> width, <span class="dt">height =</span> height)
+ htmlwidgets<span class="op">::</span><span class="kw">createWidget</span>(<span class="st">"sigma"</span>, x, <span class="dt">width =</span> width, <span class="dt">height =</span> height)
}</code></pre></div>
<p>The function takes two classes of input: the GEXF data file to render and some additional settings which control how it is rendered. This input is collected into a list named <code>x</code> which is then passed on to the <code>htmlwidgets::createWidget</code> function. This <code>x</code> variable will subsequently be made available to the JavaScript binding for sigma (this is described below). Any width or height parameter specified is also forwarded to the widget (widgets size thems [...]
<p>We want our sigma widget to also work in Shiny applications, so we add the following boilerplate Shiny output and render functions (these are always the same for all widgets):</p>
<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="co">#' @export</span>
-sigmaOutput <-<span class="st"> </span>function(outputId, <span class="dt">width =</span> <span class="st">"100%"</span>, <span class="dt">height =</span> <span class="st">"400px"</span>) {
- htmlwidgets::<span class="kw">shinyWidgetOutput</span>(outputId, <span class="st">"sigma"</span>, width, height, <span class="dt">package =</span> <span class="st">"sigma"</span>)
+sigmaOutput <-<span class="st"> </span><span class="cf">function</span>(outputId, <span class="dt">width =</span> <span class="st">"100%"</span>, <span class="dt">height =</span> <span class="st">"400px"</span>) {
+ htmlwidgets<span class="op">::</span><span class="kw">shinyWidgetOutput</span>(outputId, <span class="st">"sigma"</span>, width, height, <span class="dt">package =</span> <span class="st">"sigma"</span>)
}
<span class="co">#' @export</span>
-renderSigma <-<span class="st"> </span>function(expr, <span class="dt">env =</span> <span class="kw">parent.frame</span>(), <span class="dt">quoted =</span> <span class="ot">FALSE</span>) {
- if (!quoted) { expr <-<span class="st"> </span><span class="kw">substitute</span>(expr) } <span class="co"># force quoted</span>
- htmlwidgets::<span class="kw">shinyRenderWidget</span>(expr, sigmaOutput, env, <span class="dt">quoted =</span> <span class="ot">TRUE</span>)
+renderSigma <-<span class="st"> </span><span class="cf">function</span>(expr, <span class="dt">env =</span> <span class="kw">parent.frame</span>(), <span class="dt">quoted =</span> <span class="ot">FALSE</span>) {
+ <span class="cf">if</span> (<span class="op">!</span>quoted) { expr <-<span class="st"> </span><span class="kw">substitute</span>(expr) } <span class="co"># force quoted</span>
+ htmlwidgets<span class="op">::</span><span class="kw">shinyRenderWidget</span>(expr, sigmaOutput, env, <span class="dt">quoted =</span> <span class="ot">TRUE</span>)
}</code></pre></div>
</div>
<div id="javascript-binding" class="section level3">
@@ -331,7 +335,7 @@ renderSigma <-<span class="st"> </span>function(expr, <span class="dt">env =<
<div id="demo" class="section level3">
<h3>Demo</h3>
<p>Our widget is now complete! If you want to test drive it without reproducing all of the code locally you can install it from GitHub as follows:</p>
-<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">devtools::<span class="kw">install_github</span>(<span class="st">'jjallaire/sigma'</span>)</code></pre></div>
+<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">devtools<span class="op">::</span><span class="kw">install_github</span>(<span class="st">'jjallaire/sigma'</span>)</code></pre></div>
<p>Here’s the code to try it out with some sample data included with the package:</p>
<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">library</span>(sigma)
<span class="kw">sigma</span>(<span class="kw">system.file</span>(<span class="st">"examples/ediaspora.gexf.xml"</span>, <span class="dt">package =</span> <span class="st">"sigma"</span>))</code></pre></div>
@@ -348,11 +352,11 @@ ui =<span class="st"> </span><span class="kw">shinyUI</span>(<span class="kw">fl
<span class="kw">sigmaOutput</span>(<span class="st">'sigma'</span>)
))
-server =<span class="st"> </span>function(input, output) {
- output$sigma <-<span class="st"> </span><span class="kw">renderSigma</span>(
+server =<span class="st"> </span><span class="cf">function</span>(input, output) {
+ output<span class="op">$</span>sigma <-<span class="st"> </span><span class="kw">renderSigma</span>(
<span class="kw">sigma</span>(gexf,
- <span class="dt">drawEdges =</span> input$drawEdges,
- <span class="dt">drawNodes =</span> input$drawNodes)
+ <span class="dt">drawEdges =</span> input<span class="op">$</span>drawEdges,
+ <span class="dt">drawNodes =</span> input<span class="op">$</span>drawNodes)
)
}
@@ -376,10 +380,10 @@ server =<span class="st"> </span>function(input, output) {
<li><p>If provided, take a <a href="https://bower.io/">Bower</a> package name and automatically download the JavaScript library (and its dependencies) and add the required entries to the .yaml file.</p></li>
</ul>
<p>This method is highly recommended as it ensures that you get started with the right file structure. Here’s an example that assumes you want to create a widget named ‘mywidget’ in a new package of the same name:</p>
-<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">devtools::<span class="kw">create</span>(<span class="st">"mywidget"</span>) <span class="co"># create package using devtools</span>
+<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">devtools<span class="op">::</span><span class="kw">create</span>(<span class="st">"mywidget"</span>) <span class="co"># create package using devtools</span>
<span class="kw">setwd</span>(<span class="st">"mywidget"</span>) <span class="co"># navigate to package dir</span>
-htmlwidgets::<span class="kw">scaffoldWidget</span>(<span class="st">"mywidget"</span>) <span class="co"># create widget scaffolding</span>
-devtools::<span class="kw">install</span>() <span class="co"># install the package so we can try it</span></code></pre></div>
+htmlwidgets<span class="op">::</span><span class="kw">scaffoldWidget</span>(<span class="st">"mywidget"</span>) <span class="co"># create widget scaffolding</span>
+devtools<span class="op">::</span><span class="kw">install</span>() <span class="co"># install the package so we can try it</span></code></pre></div>
<p>This creates a simple widget that takes a single <code>text</code> argument and displays that text within the widgets HTML element. You can try it like this:</p>
<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">library</span>(mywidget)
<span class="kw">mywidget</span>(<span class="st">"hello, world"</span>)</code></pre></div>
diff --git a/inst/doc/develop_sizing.html b/inst/doc/develop_sizing.html
index de96721..5c9a144 100644
--- a/inst/doc/develop_sizing.html
+++ b/inst/doc/develop_sizing.html
@@ -4,23 +4,23 @@
<head>
-<meta charset="utf-8">
+<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />
-<meta name="date" content="2016-11-09" />
+<meta name="date" content="2017-07-10" />
<title>HTML Widget Sizing</title>
<script src="data:application/x-javascript;base64,LyohIGpRdWVyeSB2MS4xMS4zIHwgKGMpIDIwMDUsIDIwMTUgalF1ZXJ5IEZvdW5kYXRpb24sIEluYy4gfCBqcXVlcnkub3JnL2xpY2Vuc2UgKi8KIWZ1bmN0aW9uKGEsYil7Im9iamVjdCI9PXR5cGVvZiBtb2R1bGUmJiJvYmplY3QiPT10eXBlb2YgbW9kdWxlLmV4cG9ydHM/bW9kdWxlLmV4cG9ydHM9YS5kb2N1bWVudD9iKGEsITApOmZ1bmN0aW9uKGEpe2lmKCFhLmRvY3VtZW50KXRocm93IG5ldyBFcnJvcigialF1ZXJ5IHJlcXVpcmVzIGEgd2luZG93IHdpdGggYSBkb2N1bWVudCIpO3JldHVybiBiKGEpfTpiKGEpfSgidW5kZWZpbmVkIiE9dHlwZW9mIHdpbmRvdz93aW5kb3c6dG [...]
<meta name="viewport" content="width=device-width, initial-scale=1" />
-<link href="data:text/css;charset=utf-8,html%7Bfont%2Dfamily%3Asans%2Dserif%3B%2Dwebkit%2Dtext%2Dsize%2Dadjust%3A100%25%3B%2Dms%2Dtext%2Dsize%2Dadjust%3A100%25%7Dbody%7Bmargin%3A0%7Darticle%2Caside%2Cdetails%2Cfigcaption%2Cfigure%2Cfooter%2Cheader%2Chgroup%2Cmain%2Cmenu%2Cnav%2Csection%2Csummary%7Bdisplay%3Ablock%7Daudio%2Ccanvas%2Cprogress%2Cvideo%7Bdisplay%3Ainline%2Dblock%3Bvertical%2Dalign%3Abaseline%7Daudio%3Anot%28%5Bcontrols%5D%29%7Bdisplay%3Anone%3Bheight%3A0%7D%5Bhidden%5D%2Ctem [...]
+<link href="data:text/css;charset=utf-8,html%7Bfont%2Dfamily%3Asans%2Dserif%3B%2Dwebkit%2Dtext%2Dsize%2Dadjust%3A100%25%3B%2Dms%2Dtext%2Dsize%2Dadjust%3A100%25%7Dbody%7Bmargin%3A0%7Darticle%2Caside%2Cdetails%2Cfigcaption%2Cfigure%2Cfooter%2Cheader%2Chgroup%2Cmain%2Cmenu%2Cnav%2Csection%2Csummary%7Bdisplay%3Ablock%7Daudio%2Ccanvas%2Cprogress%2Cvideo%7Bdisplay%3Ainline%2Dblock%3Bvertical%2Dalign%3Abaseline%7Daudio%3Anot%28%5Bcontrols%5D%29%7Bdisplay%3Anone%3Bheight%3A0%7D%5Bhidden%5D%2Ctem [...]
<script src="data:application/x-javascript;base64,LyohCiAqIEJvb3RzdHJhcCB2My4zLjUgKGh0dHA6Ly9nZXRib290c3RyYXAuY29tKQogKiBDb3B5cmlnaHQgMjAxMS0yMDE1IFR3aXR0ZXIsIEluYy4KICogTGljZW5zZWQgdW5kZXIgdGhlIE1JVCBsaWNlbnNlCiAqLwppZigidW5kZWZpbmVkIj09dHlwZW9mIGpRdWVyeSl0aHJvdyBuZXcgRXJyb3IoIkJvb3RzdHJhcCdzIEphdmFTY3JpcHQgcmVxdWlyZXMgalF1ZXJ5Iik7K2Z1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0Ijt2YXIgYj1hLmZuLmpxdWVyeS5zcGxpdCgiICIpWzBdLnNwbGl0KCIuIik7aWYoYlswXTwyJiZiWzFdPDl8fDE9PWJbMF0mJjk9PWJbMV0mJmJbMl08MSl0aHJvdy [...]
<script src="data:application/x-javascript;base64,LyoqCiogQHByZXNlcnZlIEhUTUw1IFNoaXYgMy43LjIgfCBAYWZhcmthcyBAamRhbHRvbiBAam9uX25lYWwgQHJlbSB8IE1JVC9HUEwyIExpY2Vuc2VkCiovCi8vIE9ubHkgcnVuIHRoaXMgY29kZSBpbiBJRSA4CmlmICghIXdpbmRvdy5uYXZpZ2F0b3IudXNlckFnZW50Lm1hdGNoKCJNU0lFIDgiKSkgewohZnVuY3Rpb24oYSxiKXtmdW5jdGlvbiBjKGEsYil7dmFyIGM9YS5jcmVhdGVFbGVtZW50KCJwIiksZD1hLmdldEVsZW1lbnRzQnlUYWdOYW1lKCJoZWFkIilbMF18fGEuZG9jdW1lbnRFbGVtZW50O3JldHVybiBjLmlubmVySFRNTD0ieDxzdHlsZT4iK2IrIjwvc3R5bGU+IixkLm [...]
<script src="data:application/x-javascript;base64,LyohIFJlc3BvbmQuanMgdjEuNC4yOiBtaW4vbWF4LXdpZHRoIG1lZGlhIHF1ZXJ5IHBvbHlmaWxsICogQ29weXJpZ2h0IDIwMTMgU2NvdHQgSmVobAogKiBMaWNlbnNlZCB1bmRlciBodHRwczovL2dpdGh1Yi5jb20vc2NvdHRqZWhsL1Jlc3BvbmQvYmxvYi9tYXN0ZXIvTElDRU5TRS1NSVQKICogICovCgovLyBPbmx5IHJ1biB0aGlzIGNvZGUgaW4gSUUgOAppZiAoISF3aW5kb3cubmF2aWdhdG9yLnVzZXJBZ2VudC5tYXRjaCgiTVNJRSA4IikpIHsKIWZ1bmN0aW9uKGEpeyJ1c2Ugc3RyaWN0IjthLm1hdGNoTWVkaWE9YS5tYXRjaE1lZGlhfHxmdW5jdGlvbihhKXt2YXIgYixjPWEuZG [...]
-<script src="data:application/x-javascript;base64,Cgp3aW5kb3cuYnVpbGRUYWJzZXRzID0gZnVuY3Rpb24odG9jSUQpIHsKCiAgLy8gYnVpbGQgYSB0YWJzZXQgZnJvbSBhIHNlY3Rpb24gZGl2IHdpdGggdGhlIC50YWJzZXQgY2xhc3MKICBmdW5jdGlvbiBidWlsZFRhYnNldCh0YWJzZXQpIHsKCiAgICAvLyBjaGVjayBmb3IgZmFkZSBhbmQgcGlsbHMgb3B0aW9ucwogICAgdmFyIGZhZGUgPSB0YWJzZXQuaGFzQ2xhc3MoInRhYnNldC1mYWRlIik7CiAgICB2YXIgcGlsbHMgPSB0YWJzZXQuaGFzQ2xhc3MoInRhYnNldC1waWxscyIpOwogICAgdmFyIG5hdkNsYXNzID0gcGlsbHMgPyAibmF2LXBpbGxzIiA6ICJuYXYtdGFicyI7CgogIC [...]
+<script src="data:application/x-javascript;base64,CgovKioKICogalF1ZXJ5IFBsdWdpbjogU3RpY2t5IFRhYnMKICoKICogQGF1dGhvciBBaWRhbiBMaXN0ZXIgPGFpZGFuQHBocC5uZXQ+CiAqIGFkYXB0ZWQgYnkgUnViZW4gQXJzbGFuIHRvIGFjdGl2YXRlIHBhcmVudCB0YWJzIHRvbwogKiBodHRwOi8vd3d3LmFpZGFubGlzdGVyLmNvbS8yMDE0LzAzL3BlcnNpc3RpbmctdGhlLXRhYi1zdGF0ZS1pbi1ib290c3RyYXAvCiAqLwooZnVuY3Rpb24oJCkgewogICJ1c2Ugc3RyaWN0IjsKICAkLmZuLnJtYXJrZG93blN0aWNreVRhYnMgPSBmdW5jdGlvbigpIHsKICAgIHZhciBjb250ZXh0ID0gdGhpczsKICAgIC8vIFNob3cgdGhlIHRhYi [...]
<style type="text/css">code{white-space: pre;}</style>
@@ -28,37 +28,41 @@
div.sourceCode { overflow-x: auto; }
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
margin: 0; padding: 0; vertical-align: baseline; border: none; }
-table.sourceCode { width: 100%; line-height: 100%; }
-td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; background-color: #dddddd; }
+table.sourceCode { width: 100%; line-height: 100%; background-color: #ffffff; color: #1f1c1b; }
+td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; background-color: #ffffff; color: #a0a0a0; border-right: 1px solid #a0a0a0; }
td.sourceCode { padding-left: 5px; }
-code > span.kw { font-weight: bold; } /* Keyword */
-code > span.dt { color: #800000; } /* DataType */
-code > span.dv { color: #0000ff; } /* DecVal */
-code > span.bn { color: #0000ff; } /* BaseN */
-code > span.fl { color: #800080; } /* Float */
-code > span.ch { color: #ff00ff; } /* Char */
-code > span.st { color: #dd0000; } /* String */
-code > span.co { color: #808080; font-style: italic; } /* Comment */
-code > span.al { color: #00ff00; font-weight: bold; } /* Alert */
-code > span.fu { color: #000080; } /* Function */
-code > span.er { color: #ff0000; font-weight: bold; } /* Error */
-code > span.wa { color: #ff0000; font-weight: bold; } /* Warning */
-code > span.cn { color: #000000; } /* Constant */
-code > span.sc { color: #ff00ff; } /* SpecialChar */
-code > span.vs { color: #dd0000; } /* VerbatimString */
-code > span.ss { color: #dd0000; } /* SpecialString */
-code > span.im { } /* Import */
-code > span.va { } /* Variable */
-code > span.cf { } /* ControlFlow */
-code > span.op { } /* Operator */
-code > span.bu { } /* BuiltIn */
-code > span.ex { } /* Extension */
-code > span.pp { font-weight: bold; } /* Preprocessor */
-code > span.at { } /* Attribute */
-code > span.do { color: #808080; font-style: italic; } /* Documentation */
-code > span.an { color: #808080; font-weight: bold; font-style: italic; } /* Annotation */
-code > span.cv { color: #808080; font-weight: bold; font-style: italic; } /* CommentVar */
-code > span.in { color: #808080; font-weight: bold; font-style: italic; } /* Information */
+pre, code { color: #1f1c1b; background-color: #ffffff; }
+code > span.kw { color: #1f1c1b; font-weight: bold; } /* Keyword */
+code > span.dt { color: #0057ae; } /* DataType */
+code > span.dv { color: #b08000; } /* DecVal */
+code > span.bn { color: #b08000; } /* BaseN */
+code > span.fl { color: #b08000; } /* Float */
+code > span.cn { color: #aa5500; } /* Constant */
+code > span.ch { color: #924c9d; } /* Char */
+code > span.sc { color: #3daee9; } /* SpecialChar */
+code > span.st { color: #bf0303; } /* String */
+code > span.vs { color: #bf0303; } /* VerbatimString */
+code > span.ss { color: #ff5500; } /* SpecialString */
+code > span.im { color: #ff5500; } /* Import */
+code > span.co { color: #898887; } /* Comment */
+code > span.do { color: #607880; } /* Documentation */
+code > span.an { color: #ca60ca; } /* Annotation */
+code > span.cv { color: #0095ff; } /* CommentVar */
+code > span.ot { color: #006e28; } /* Other */
+code > span.fu { color: #644a9b; } /* Function */
+code > span.va { color: #0057ae; } /* Variable */
+code > span.cf { color: #1f1c1b; font-weight: bold; } /* ControlFlow */
+code > span.op { color: #1f1c1b; } /* Operator */
+code > span.bu { color: #644a9b; font-weight: bold; } /* BuiltIn */
+code > span.ex { color: #0095ff; font-weight: bold; } /* Extension */
+code > span.pp { color: #006e28; } /* Preprocessor */
+code > span.at { color: #0057ae; } /* Attribute */
+code > span.re { color: #0057ae; } /* RegionMarker */
+code > span.in { color: #b08000; } /* Information */
+code > span.wa { color: #bf0303; } /* Warning */
+code > span.al { color: #bf0303; font-weight: bold; } /* Alert */
+code > span.er { color: #bf0303; text-decoration: underline; } /* Error */
+code > span. { color: #1f1c1b; } /* Normal */
</style>
<style type="text/css">
pre:not([class]) {
@@ -144,7 +148,7 @@ $(document).ready(function () {
<h1 class="title toc-ignore">HTML Widget Sizing</h1>
-<h4 class="date"><em>2016-11-09</em></h4>
+<h4 class="date"><em>2017-07-10</em></h4>
</div>
@@ -182,12 +186,12 @@ $(document).ready(function () {
<h2>Specifying a sizing policy</h2>
<p>The default HTML widget sizing policy treats the widget with the same sizing semantics as an R plot. When printed at the R console the widget is displayed within the RStudio Viewer and sized to fill the Viewer pane (modulo any padding). When rendered inside an R Markdown document the widget is sized based on the default size of figures in the document.</p>
<p>Note that for most widgets the default sizing behavior is fine and you won’t need to create a custom sizing policy. If you need a slightly different behavior than the default you can also selectively override the default behavior by calling the <code>sizingPolicy</code> function and passing the result to <code>createWidget</code>. For example:</p>
-<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">htmlwidgets::<span class="kw">createWidget</span>(
+<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">htmlwidgets<span class="op">::</span><span class="kw">createWidget</span>(
<span class="st">"sigma"</span>,
x,
<span class="dt">width =</span> width,
<span class="dt">height =</span> height,
- <span class="dt">sizingPolicy =</span> htmlwidgets::<span class="kw">sizingPolicy</span>(
+ <span class="dt">sizingPolicy =</span> htmlwidgets<span class="op">::</span><span class="kw">sizingPolicy</span>(
<span class="dt">viewer.padding =</span> <span class="dv">0</span>,
<span class="dt">viewer.paneHeight =</span> <span class="dv">500</span>,
<span class="dt">browser.fill =</span> <span class="ot">TRUE</span>
diff --git a/inst/www/htmlwidgets.js b/inst/www/htmlwidgets.js
index 7193c78..ecda3ef 100644
--- a/inst/www/htmlwidgets.js
+++ b/inst/www/htmlwidgets.js
@@ -489,6 +489,7 @@
// supported natively by Shiny at the time of this writing.
shinyBinding.renderValue = function(el, data) {
+ Shiny.renderDependencies(data.deps);
// Resolve strings marked as javascript literals to objects
if (!(data.evals instanceof Array)) data.evals = [data.evals];
for (var i = 0; data.evals && i < data.evals.length; i++) {
@@ -512,7 +513,6 @@
elementData(el, "init_result", result);
}
}
- Shiny.renderDependencies(data.deps);
bindingDef.renderValue(el, data.x, elementData(el, "init_result"));
evalAndRun(data.jsHooks.render, elementData(el, "init_result"), [el, data.x]);
};
diff --git a/man/JS.Rd b/man/JS.Rd
index efe3965..7d2f3bb 100644
--- a/man/JS.Rd
+++ b/man/JS.Rd
@@ -24,4 +24,3 @@ JS('function(x) {', 'return x + 1;', '}')
\author{
Yihui Xie
}
-
diff --git a/man/createWidget.Rd b/man/createWidget.Rd
index fa79f84..ee77f9d 100644
--- a/man/createWidget.Rd
+++ b/man/createWidget.Rd
@@ -59,4 +59,3 @@ the specified package.
For additional details on developing widgets, see package vignettes:
\code{vignette("develop_intro", package = "htmlwidgets")}.
}
-
diff --git a/man/getDependency.Rd b/man/getDependency.Rd
index eb5dd2b..b4af51e 100644
--- a/man/getDependency.Rd
+++ b/man/getDependency.Rd
@@ -14,4 +14,3 @@ getDependency(name, package = name)
\description{
Get js and css dependencies for a htmlwidget
}
-
diff --git a/man/htmlwidgets-shiny.Rd b/man/htmlwidgets-shiny.Rd
index 89708a4..195366f 100644
--- a/man/htmlwidgets-shiny.Rd
+++ b/man/htmlwidgets-shiny.Rd
@@ -2,8 +2,8 @@
% Please edit documentation in R/htmlwidgets.R
\name{htmlwidgets-shiny}
\alias{htmlwidgets-shiny}
-\alias{shinyRenderWidget}
\alias{shinyWidgetOutput}
+\alias{shinyRenderWidget}
\title{Shiny bindings for HTML widgets}
\usage{
shinyWidgetOutput(outputId, name, width, height, package = name,
@@ -60,4 +60,3 @@ renderFoo <- function(expr, env = parent.frame(), quoted = FALSE) {
htmlwidgets::shinyRenderWidget(expr, fooOutput, env, quoted = TRUE)
}
}
-
diff --git a/man/onRender.Rd b/man/onRender.Rd
index c996b6b..b5c1f3e 100644
--- a/man/onRender.Rd
+++ b/man/onRender.Rd
@@ -83,4 +83,3 @@ leaflet() \%>\% addTiles() \%>\%
\code{\link{onStaticRenderComplete}}, for writing custom JavaScript
that involves multiple widgets.
}
-
diff --git a/man/onStaticRenderComplete.Rd b/man/onStaticRenderComplete.Rd
index 4b2b2c0..de902f4 100644
--- a/man/onStaticRenderComplete.Rd
+++ b/man/onStaticRenderComplete.Rd
@@ -49,4 +49,3 @@ print(page, browse = TRUE)
}
}
-
diff --git a/man/prependContent.Rd b/man/prependContent.Rd
index 93fe9d0..5605987 100644
--- a/man/prependContent.Rd
+++ b/man/prependContent.Rd
@@ -1,8 +1,8 @@
% Generated by roxygen2: do not edit by hand
% Please edit documentation in R/htmlwidgets.R
\name{prependContent}
-\alias{appendContent}
\alias{prependContent}
+\alias{appendContent}
\title{Prepend/append extra HTML content to a widget}
\usage{
prependContent(x, ...)
@@ -26,4 +26,3 @@ running in a Shiny widget rendering function, and will result in a warning if
used in that context. Multiple calls are allowed, and later calls do not undo
the effects of previous calls.
}
-
diff --git a/man/saveWidget.Rd b/man/saveWidget.Rd
index 7668bdc..84ba531 100644
--- a/man/saveWidget.Rd
+++ b/man/saveWidget.Rd
@@ -27,4 +27,3 @@ Defaults to white.}
\description{
Save a rendered widget to an HTML file (e.g. for sharing with others).
}
-
diff --git a/man/scaffoldWidget.Rd b/man/scaffoldWidget.Rd
index 762c7a1..4c3e84e 100644
--- a/man/scaffoldWidget.Rd
+++ b/man/scaffoldWidget.Rd
@@ -24,4 +24,3 @@ Add the minimal code required to implement an HTML widget to an R package.
This function must be executed from the root directory of the package
you wish to add the widget to.
}
-
diff --git a/man/setWidgetIdSeed.Rd b/man/setWidgetIdSeed.Rd
index 1d6e90e..cded181 100644
--- a/man/setWidgetIdSeed.Rd
+++ b/man/setWidgetIdSeed.Rd
@@ -24,4 +24,3 @@ Set a random seed for generating widget element ids. Calling this
function rather than relying on the default behavior ensures
stable widget ids across sessions.
}
-
diff --git a/man/sizingPolicy.Rd b/man/sizingPolicy.Rd
index 027d4bf..cc51419 100644
--- a/man/sizingPolicy.Rd
+++ b/man/sizingPolicy.Rd
@@ -101,4 +101,3 @@ For additional details on widget sizing:
\code{vignette("develop_sizing", package = "htmlwidgets")}
}
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-htmlwidgets.git
More information about the debian-med-commit
mailing list