[med-svn] [r-cran-shiny] 03/06: Imported Upstream version 0.13.1+dfsg1
Andreas Tille
tille at debian.org
Wed Apr 13 20:59:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-shiny.
commit d22444c628f627597fef7371cffd1d01839df03f
Author: Andreas Tille <tille at debian.org>
Date: Wed Apr 13 22:38:42 2016 +0200
Imported Upstream version 0.13.1+dfsg1
---
DESCRIPTION | 8 +-
MD5 | 10 +-
NEWS | 5 +
inst/doc/events.html | 15 +-
inst/www/shared/bootstrap/js/npm.js | 13 +
.../shared/datatables/css/dataTables.bootstrap.css | 319 +++++++++++++++++++++
.../www/shared/datatables/css/dataTables.extra.css | 30 ++
inst/www/shared/datatables/images/sort_asc.png | Bin 0 -> 1118 bytes
.../shared/datatables/images/sort_asc_disabled.png | Bin 0 -> 1050 bytes
inst/www/shared/datatables/images/sort_both.png | Bin 0 -> 1136 bytes
inst/www/shared/datatables/images/sort_desc.png | Bin 0 -> 1127 bytes
.../datatables/images/sort_desc_disabled.png | Bin 0 -> 1045 bytes
.../shared/datatables/js/dataTables.bootstrap.js | 186 ++++++++++++
inst/www/shared/datatables/upgrade1.10.txt | 95 ++++++
inst/www/shared/shiny.min.js | 2 +-
man/htmlTemplate.Rd | 8 +-
16 files changed, 671 insertions(+), 20 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 8e4bd45..de5bd8e 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: shiny
Type: Package
Title: Web Application Framework for R
-Version: 0.13.1
-Date: 2016-02-17
+Version: 0.13.2
+Date: 2016-03-28
Authors at R: c(
person("Winston", "Chang", role = c("aut", "cre"), email = "winston at rstudio.com"),
person("Joe", "Cheng", role = "aut", email = "joe at rstudio.com"),
@@ -85,7 +85,7 @@ Collate: 'app.R' 'bootstrap-layout.R' 'conditions.R' 'map.R'
'update-input.R'
RoxygenNote: 5.0.1
NeedsCompilation: no
-Packaged: 2016-02-17 18:04:25 UTC; winston
+Packaged: 2016-03-28 15:21:34 UTC; winston
Author: Winston Chang [aut, cre],
Joe Cheng [aut],
JJ Allaire [aut],
@@ -118,4 +118,4 @@ Author: Winston Chang [aut, cre],
R Core Team [ctb, cph] (tar implementation from R)
Maintainer: Winston Chang <winston at rstudio.com>
Repository: CRAN
-Date/Publication: 2016-02-17 22:02:46
+Date/Publication: 2016-03-28 18:59:41
diff --git a/MD5 b/MD5
index 526d7be..9a68f4b 100644
--- a/MD5
+++ b/MD5
@@ -1,7 +1,7 @@
-2ad6915227302c8aecf5b3b76f2c0e92 *DESCRIPTION
+d6822b2e7d2aac40a6f3f9b92e61c322 *DESCRIPTION
3ea3bb190b681ed860efbb72545a0de7 *LICENSE
e2b2a23520dd2ecf5e564c8b06f3af85 *NAMESPACE
-6fa90d0e81213255a5a310d67b58e702 *NEWS
+628bf8ee3bac447816fce91aff6ec1b3 *NEWS
5ab3e1e0ff631d4daba310c6a976433f *R/app.R
b029d63dc362e63fd99f1ccc683e386d *R/bootstrap-layout.R
75d9b77e9eb740096f1d736ac437881e *R/bootstrap.R
@@ -58,7 +58,7 @@ f2951f8433533b3e697d46bdf310b9a7 *R/utils.R
4fa1da11c70d19fe988bd1b0247eaa98 *build/vignette.rds
d31f345df444a62ece470655020ee2b8 *inst/doc/events.R
38a278f834081a0a0e64ec3e4737cdd9 *inst/doc/events.Rmd
-00cea48ed10172dbc7b2b89e4dea274c *inst/doc/events.html
+a82447c03ada48106a5aa26862d4a825 *inst/doc/events.html
13f970fb92cec9836ea297717872f46e *inst/examples/01_hello/DESCRIPTION
85d0eaa1f8d68da015f0447469489143 *inst/examples/01_hello/Readme.md
59c210b096161daeedde3c9d96c1efbd *inst/examples/01_hello/rsconnect/localhost/admin/01_hello.dcf
@@ -245,7 +245,7 @@ c539894c4785ce273996b9d5376c048e *inst/www/shared/shiny-showcase.css
e9806de66ff7cd1d467398bf4ebe85e2 *inst/www/shared/shiny.css
31c36e3988c8953815890b3c7f0ecfdb *inst/www/shared/shiny.js
32f6d3f636bef81ad5c226a784ab540b *inst/www/shared/shiny.js.map
-201db68aee7e50c50a7d83b0b33eac3b *inst/www/shared/shiny.min.js
+6d56c9dca6bf55204b4d07a6b32e08c5 *inst/www/shared/shiny.min.js
71859b3be5df9fd01f44c25f2c3b0813 *inst/www/shared/shiny.min.js.map
d42bccda0accb4e937f79e5bd9540643 *inst/www/shared/showdown/compressed/showdown.js
ae18a8f49f1a446ca1772447b95a99d0 *inst/www/shared/showdown/license.txt
@@ -286,7 +286,7 @@ ecbbb7a17d0d51a46b2b665b8e13cfe9 *man/fillRow.Rd
a4ba8d8c599204740128fea8b6711029 *man/helpText.Rd
b7e98aeab986df2f38906b9810c43ecb *man/hoverOpts.Rd
406342e1835b163037604718f4d2be33 *man/htmlOutput.Rd
-7f793b3d7e111ffa2c779dff6b471692 *man/htmlTemplate.Rd
+b6db1c34fc97f2fa8fb24f7d2713aec5 *man/htmlTemplate.Rd
1523581bdab30606e35ccac2df72a699 *man/icon.Rd
82b947ce74f2de68a3d3d9f40c73770d *man/include.Rd
669379d570b9756032d5739598566053 *man/inputPanel.Rd
diff --git a/NEWS b/NEWS
index 132c297..a3d56ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+shiny 0.13.2
+--------------------------------------------------------------------------------
+
+* Updated documentation for `htmlTemplate`.
+
shiny 0.13.1
--------------------------------------------------------------------------------
diff --git a/inst/doc/events.html b/inst/doc/events.html
index 05c9ad1..c0908f4 100644
--- a/inst/doc/events.html
+++ b/inst/doc/events.html
@@ -7,10 +7,11 @@
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="pandoc" />
+<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="author" content="Yihui Xie" />
-<meta name="date" content="2016-02-17" />
+<meta name="date" content="2016-03-28" />
<title>JavaScript Events in Shiny</title>
@@ -54,11 +55,6 @@ code > span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Ann
code > span.cv { color: #60a0b0; font-weight: bold; font-style: italic; } /* CommentVar */
code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
</style>
-<style type="text/css">
- pre:not([class]) {
- background-color: white;
- }
-</style>
<link href="data:text/css;charset=utf-8,body%20%7B%0Abackground%2Dcolor%3A%20%23fff%3B%0Amargin%3A%201em%20auto%3B%0Amax%2Dwidth%3A%20800px%3B%0Aoverflow%3A%20visible%3B%0Apadding%2Dleft%3A%202em%3B%0Apadding%2Dright%3A%202em%3B%0Afont%2Dfamily%3A%20%22Helvetica%20Neue%22%2C%20Helvetica%2C%20Arial%2C%20sans%2Dserif%3B%0Afont%2Dsize%3A%2014px%3B%0Aline%2Dheight%3A%2020px%3B%0A%7D%0A%23header%20%7B%0Atext%2Dalign%3A%20center%3B%0A%7D%0A%23TOC%20%7B%0Aclear%3A%20both%3B%0Amargin%3A%200%200% [...]
@@ -69,10 +65,13 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
-<div id="header">
+<div class="fluid-row" id="header">
+
+
<h1 class="title">JavaScript Events in Shiny</h1>
<h4 class="author"><em>Yihui Xie</em></h4>
-<h4 class="date"><em>2016-02-17</em></h4>
+<h4 class="date"><em>2016-03-28</em></h4>
+
</div>
diff --git a/inst/www/shared/bootstrap/js/npm.js b/inst/www/shared/bootstrap/js/npm.js
new file mode 100644
index 0000000..bf6aa80
--- /dev/null
+++ b/inst/www/shared/bootstrap/js/npm.js
@@ -0,0 +1,13 @@
+// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
+require('../../js/transition.js')
+require('../../js/alert.js')
+require('../../js/button.js')
+require('../../js/carousel.js')
+require('../../js/collapse.js')
+require('../../js/dropdown.js')
+require('../../js/modal.js')
+require('../../js/tooltip.js')
+require('../../js/popover.js')
+require('../../js/scrollspy.js')
+require('../../js/tab.js')
+require('../../js/affix.js')
\ No newline at end of file
diff --git a/inst/www/shared/datatables/css/dataTables.bootstrap.css b/inst/www/shared/datatables/css/dataTables.bootstrap.css
new file mode 100644
index 0000000..faee0e5
--- /dev/null
+++ b/inst/www/shared/datatables/css/dataTables.bootstrap.css
@@ -0,0 +1,319 @@
+div.dataTables_length label {
+ font-weight: normal;
+ text-align: left;
+ white-space: nowrap;
+}
+
+div.dataTables_length select {
+ width: 75px;
+ display: inline-block;
+}
+
+div.dataTables_filter {
+ text-align: right;
+}
+
+div.dataTables_filter label {
+ font-weight: normal;
+ white-space: nowrap;
+ text-align: left;
+}
+
+div.dataTables_filter input {
+ margin-left: 0.5em;
+ display: inline-block;
+}
+
+div.dataTables_info {
+ padding-top: 8px;
+ white-space: nowrap;
+}
+
+div.dataTables_paginate {
+ margin: 0;
+ white-space: nowrap;
+ text-align: right;
+}
+
+div.dataTables_paginate ul.pagination {
+ margin: 2px 0;
+ white-space: nowrap;
+}
+
+ at media screen and (max-width: 767px) {
+ div.dataTables_length,
+ div.dataTables_filter,
+ div.dataTables_info,
+ div.dataTables_paginate {
+ text-align: center;
+ }
+}
+
+
+table.dataTable td,
+table.dataTable th {
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+}
+
+
+table.dataTable {
+ clear: both;
+ margin-top: 6px !important;
+ margin-bottom: 6px !important;
+ max-width: none !important;
+}
+
+table.dataTable thead .sorting,
+table.dataTable thead .sorting_asc,
+table.dataTable thead .sorting_desc,
+table.dataTable thead .sorting_asc_disabled,
+table.dataTable thead .sorting_desc_disabled {
+ cursor: pointer;
+}
+
+table.dataTable thead .sorting { background: url('../images/sort_both.png') no-repeat center right; }
+table.dataTable thead .sorting_asc { background: url('../images/sort_asc.png') no-repeat center right; }
+table.dataTable thead .sorting_desc { background: url('../images/sort_desc.png') no-repeat center right; }
+
+table.dataTable thead .sorting_asc_disabled { background: url('../images/sort_asc_disabled.png') no-repeat center right; }
+table.dataTable thead .sorting_desc_disabled { background: url('../images/sort_desc_disabled.png') no-repeat center right; }
+
+table.dataTable thead > tr > th {
+ padding-left: 18px;
+ padding-right: 18px;
+}
+
+table.dataTable th:active {
+ outline: none;
+}
+
+/* Scrolling */
+div.dataTables_scrollHead table {
+ margin-bottom: 0 !important;
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
+}
+
+div.dataTables_scrollHead table thead tr:last-child th:first-child,
+div.dataTables_scrollHead table thead tr:last-child td:first-child {
+ border-bottom-left-radius: 0 !important;
+ border-bottom-right-radius: 0 !important;
+}
+
+div.dataTables_scrollBody table {
+ border-top: none;
+ margin-top: 0 !important;
+ margin-bottom: 0 !important;
+}
+
+div.dataTables_scrollBody tbody tr:first-child th,
+div.dataTables_scrollBody tbody tr:first-child td {
+ border-top: none;
+}
+
+div.dataTables_scrollFoot table {
+ margin-top: 0 !important;
+ border-top: none;
+}
+
+/* Frustratingly the border-collapse:collapse used by Bootstrap makes the column
+ width calculations when using scrolling impossible to align columns. We have
+ to use separate
+ */
+table.table-bordered.dataTable {
+ border-collapse: separate !important;
+}
+table.table-bordered thead th,
+table.table-bordered thead td {
+ border-left-width: 0;
+ border-top-width: 0;
+}
+table.table-bordered tbody th,
+table.table-bordered tbody td {
+ border-left-width: 0;
+ border-bottom-width: 0;
+}
+table.table-bordered th:last-child,
+table.table-bordered td:last-child {
+ border-right-width: 0;
+}
+div.dataTables_scrollHead table.table-bordered {
+ border-bottom-width: 0;
+}
+
+
+
+
+/*
+ * TableTools styles
+ */
+.table.dataTable tbody tr.active td,
+.table.dataTable tbody tr.active th {
+ background-color: #08C;
+ color: white;
+}
+
+.table.dataTable tbody tr.active:hover td,
+.table.dataTable tbody tr.active:hover th {
+ background-color: #0075b0 !important;
+}
+
+.table.dataTable tbody tr.active th > a,
+.table.dataTable tbody tr.active td > a {
+ color: white;
+}
+
+.table-striped.dataTable tbody tr.active:nth-child(odd) td,
+.table-striped.dataTable tbody tr.active:nth-child(odd) th {
+ background-color: #017ebc;
+}
+
+table.DTTT_selectable tbody tr {
+ cursor: pointer;
+}
+
+div.DTTT .btn {
+ color: #333 !important;
+ font-size: 12px;
+}
+
+div.DTTT .btn:hover {
+ text-decoration: none !important;
+}
+
+ul.DTTT_dropdown.dropdown-menu {
+ z-index: 2003;
+}
+
+ul.DTTT_dropdown.dropdown-menu a {
+ color: #333 !important; /* needed only when demo_page.css is included */
+}
+
+ul.DTTT_dropdown.dropdown-menu li {
+ position: relative;
+}
+
+ul.DTTT_dropdown.dropdown-menu li:hover a {
+ background-color: #0088cc;
+ color: white !important;
+}
+
+div.DTTT_collection_background {
+ z-index: 2002;
+}
+
+/* TableTools information display */
+div.DTTT_print_info {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ width: 400px;
+ height: 150px;
+ margin-left: -200px;
+ margin-top: -75px;
+ text-align: center;
+ color: #333;
+ padding: 10px 30px;
+ opacity: 0.95;
+
+ background-color: white;
+ border: 1px solid rgba(0, 0, 0, 0.2);
+ border-radius: 6px;
+
+ -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+ box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+}
+
+div.DTTT_print_info h6 {
+ font-weight: normal;
+ font-size: 28px;
+ line-height: 28px;
+ margin: 1em;
+}
+
+div.DTTT_print_info p {
+ font-size: 14px;
+ line-height: 20px;
+}
+
+div.dataTables_processing {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: 100%;
+ height: 60px;
+ margin-left: -50%;
+ margin-top: -25px;
+ padding-top: 20px;
+ padding-bottom: 20px;
+ text-align: center;
+ font-size: 1.2em;
+ background-color: white;
+ background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255,255,255,0)), color-stop(25%, rgba(255,255,255,0.9)), color-stop(75%, rgba(255,255,255,0.9)), color-stop(100%, rgba(255,255,255,0)));
+ background: -webkit-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+ background: -moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+ background: -ms-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+ background: -o-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+ background: linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+}
+
+
+
+/*
+ * FixedColumns styles
+ */
+div.DTFC_LeftHeadWrapper table,
+div.DTFC_LeftFootWrapper table,
+div.DTFC_RightHeadWrapper table,
+div.DTFC_RightFootWrapper table,
+table.DTFC_Cloned tr.even {
+ background-color: white;
+ margin-bottom: 0;
+}
+
+div.DTFC_RightHeadWrapper table ,
+div.DTFC_LeftHeadWrapper table {
+ border-bottom: none !important;
+ margin-bottom: 0 !important;
+ border-top-right-radius: 0 !important;
+ border-bottom-left-radius: 0 !important;
+ border-bottom-right-radius: 0 !important;
+}
+
+div.DTFC_RightHeadWrapper table thead tr:last-child th:first-child,
+div.DTFC_RightHeadWrapper table thead tr:last-child td:first-child,
+div.DTFC_LeftHeadWrapper table thead tr:last-child th:first-child,
+div.DTFC_LeftHeadWrapper table thead tr:last-child td:first-child {
+ border-bottom-left-radius: 0 !important;
+ border-bottom-right-radius: 0 !important;
+}
+
+div.DTFC_RightBodyWrapper table,
+div.DTFC_LeftBodyWrapper table {
+ border-top: none;
+ margin: 0 !important;
+}
+
+div.DTFC_RightBodyWrapper tbody tr:first-child th,
+div.DTFC_RightBodyWrapper tbody tr:first-child td,
+div.DTFC_LeftBodyWrapper tbody tr:first-child th,
+div.DTFC_LeftBodyWrapper tbody tr:first-child td {
+ border-top: none;
+}
+
+div.DTFC_RightFootWrapper table,
+div.DTFC_LeftFootWrapper table {
+ border-top: none;
+ margin-top: 0 !important;
+}
+
+
+/*
+ * FixedHeader styles
+ */
+div.FixedHeader_Cloned table {
+ margin: 0 !important
+}
+
diff --git a/inst/www/shared/datatables/css/dataTables.extra.css b/inst/www/shared/datatables/css/dataTables.extra.css
new file mode 100644
index 0000000..e87ece0
--- /dev/null
+++ b/inst/www/shared/datatables/css/dataTables.extra.css
@@ -0,0 +1,30 @@
+/* Sorting */
+table.dataTable tr.odd td.sorting_1 { background-color: #D3D6FF; }
+table.dataTable tr.odd td.sorting_2 { background-color: #DADCFF; }
+table.dataTable tr.odd td.sorting_3 { background-color: #E0E2FF; }
+table.dataTable tr.even td.sorting_1 { background-color: #EAEBFF; }
+table.dataTable tr.even td.sorting_2 { background-color: #F2F3FF; }
+table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; }
+
+table.dataTable tr.odd td.sorting_1 { background-color: #D3D6FF; }
+table.dataTable tr.odd td.sorting_2 { background-color: #DADCFF; }
+table.dataTable tr.odd td.sorting_3 { background-color: #E0E2FF; }
+table.dataTable tr.even td.sorting_1 { background-color: #EAEBFF; }
+table.dataTable tr.even td.sorting_2 { background-color: #F2F3FF; }
+table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; }
+
+/* Selected rows */
+table.dataTable tbody tr.selected,
+table.dataTable tr.selected td.sorting_1,
+table.dataTable tr.selected td.sorting_2,
+table.dataTable tr.selected td.sorting_3,
+.table-striped tbody>tr.selected:nth-child(odd)>td,
+.table-striped tbody>tr.selected:nth-child(even)>td {
+ background-color: #b0bed9;
+}
+
+/* Search boxes in the footer */
+table tfoot input {
+ width: 100%;
+}
+
diff --git a/inst/www/shared/datatables/images/sort_asc.png b/inst/www/shared/datatables/images/sort_asc.png
new file mode 100644
index 0000000..a88d797
Binary files /dev/null and b/inst/www/shared/datatables/images/sort_asc.png differ
diff --git a/inst/www/shared/datatables/images/sort_asc_disabled.png b/inst/www/shared/datatables/images/sort_asc_disabled.png
new file mode 100644
index 0000000..4e144cf
Binary files /dev/null and b/inst/www/shared/datatables/images/sort_asc_disabled.png differ
diff --git a/inst/www/shared/datatables/images/sort_both.png b/inst/www/shared/datatables/images/sort_both.png
new file mode 100644
index 0000000..1867040
Binary files /dev/null and b/inst/www/shared/datatables/images/sort_both.png differ
diff --git a/inst/www/shared/datatables/images/sort_desc.png b/inst/www/shared/datatables/images/sort_desc.png
new file mode 100644
index 0000000..def071e
Binary files /dev/null and b/inst/www/shared/datatables/images/sort_desc.png differ
diff --git a/inst/www/shared/datatables/images/sort_desc_disabled.png b/inst/www/shared/datatables/images/sort_desc_disabled.png
new file mode 100644
index 0000000..7824973
Binary files /dev/null and b/inst/www/shared/datatables/images/sort_desc_disabled.png differ
diff --git a/inst/www/shared/datatables/js/dataTables.bootstrap.js b/inst/www/shared/datatables/js/dataTables.bootstrap.js
new file mode 100644
index 0000000..2c6959d
--- /dev/null
+++ b/inst/www/shared/datatables/js/dataTables.bootstrap.js
@@ -0,0 +1,186 @@
+/*! DataTables Bootstrap 3 integration
+ * ©2011-2014 SpryMedia Ltd - datatables.net/license
+ */
+
+/**
+ * DataTables integration for Bootstrap 3. This requires Bootstrap 3 and
+ * DataTables 1.10 or newer.
+ *
+ * This file sets the defaults and adds options to DataTables to style its
+ * controls using Bootstrap. See http://datatables.net/manual/styling/bootstrap
+ * for further information.
+ */
+(function(window, document, undefined){
+
+var factory = function( $, DataTable ) {
+"use strict";
+
+
+/* Set the defaults for DataTables initialisation */
+$.extend( true, DataTable.defaults, {
+ dom:
+ "<'row'<'col-sm-6'l><'col-sm-6'f>>" +
+ "<'row'<'col-sm-12'tr>>" +
+ "<'row'<'col-sm-6'i><'col-sm-6'p>>",
+ renderer: 'bootstrap'
+} );
+
+
+/* Default class modification */
+$.extend( DataTable.ext.classes, {
+ sWrapper: "dataTables_wrapper form-inline dt-bootstrap",
+ sFilterInput: "form-control input-sm",
+ sLengthSelect: "form-control input-sm"
+} );
+
+
+/* Bootstrap paging button renderer */
+DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, buttons, page, pages ) {
+ var api = new DataTable.Api( settings );
+ var classes = settings.oClasses;
+ var lang = settings.oLanguage.oPaginate;
+ var btnDisplay, btnClass;
+
+ var attach = function( container, buttons ) {
+ var i, ien, node, button;
+ var clickHandler = function ( e ) {
+ e.preventDefault();
+ if ( !$(e.currentTarget).hasClass('disabled') ) {
+ api.page( e.data.action ).draw( false );
+ }
+ };
+
+ for ( i=0, ien=buttons.length ; i<ien ; i++ ) {
+ button = buttons[i];
+
+ if ( $.isArray( button ) ) {
+ attach( container, button );
+ }
+ else {
+ btnDisplay = '';
+ btnClass = '';
+
+ switch ( button ) {
+ case 'ellipsis':
+ btnDisplay = '…';
+ btnClass = 'disabled';
+ break;
+
+ case 'first':
+ btnDisplay = lang.sFirst;
+ btnClass = button + (page > 0 ?
+ '' : ' disabled');
+ break;
+
+ case 'previous':
+ btnDisplay = lang.sPrevious;
+ btnClass = button + (page > 0 ?
+ '' : ' disabled');
+ break;
+
+ case 'next':
+ btnDisplay = lang.sNext;
+ btnClass = button + (page < pages-1 ?
+ '' : ' disabled');
+ break;
+
+ case 'last':
+ btnDisplay = lang.sLast;
+ btnClass = button + (page < pages-1 ?
+ '' : ' disabled');
+ break;
+
+ default:
+ btnDisplay = button + 1;
+ btnClass = page === button ?
+ 'active' : '';
+ break;
+ }
+
+ if ( btnDisplay ) {
+ node = $('<li>', {
+ 'class': classes.sPageButton+' '+btnClass,
+ 'aria-controls': settings.sTableId,
+ 'tabindex': settings.iTabIndex,
+ 'id': idx === 0 && typeof button === 'string' ?
+ settings.sTableId +'_'+ button :
+ null
+ } )
+ .append( $('<a>', {
+ 'href': '#'
+ } )
+ .html( btnDisplay )
+ )
+ .appendTo( container );
+
+ settings.oApi._fnBindAction(
+ node, {action: button}, clickHandler
+ );
+ }
+ }
+ }
+ };
+
+ attach(
+ $(host).empty().html('<ul class="pagination"/>').children('ul'),
+ buttons
+ );
+};
+
+
+/*
+ * TableTools Bootstrap compatibility
+ * Required TableTools 2.1+
+ */
+if ( DataTable.TableTools ) {
+ // Set the classes that TableTools uses to something suitable for Bootstrap
+ $.extend( true, DataTable.TableTools.classes, {
+ "container": "DTTT btn-group",
+ "buttons": {
+ "normal": "btn btn-default",
+ "disabled": "disabled"
+ },
+ "collection": {
+ "container": "DTTT_dropdown dropdown-menu",
+ "buttons": {
+ "normal": "",
+ "disabled": "disabled"
+ }
+ },
+ "print": {
+ "info": "DTTT_print_info"
+ },
+ "select": {
+ "row": "active"
+ }
+ } );
+
+ // Have the collection use a bootstrap compatible drop down
+ $.extend( true, DataTable.TableTools.DEFAULTS.oTags, {
+ "collection": {
+ "container": "ul",
+ "button": "li",
+ "liner": "a"
+ }
+ } );
+}
+
+}; // /factory
+
+
+// Define as an AMD module if possible
+if ( typeof define === 'function' && define.amd ) {
+ define( ['jquery', 'datatables'], factory );
+}
+else if ( typeof exports === 'object' ) {
+ // Node/CommonJS
+ factory( require('jquery'), require('datatables') );
+}
+else if ( jQuery ) {
+ // Otherwise simply initialise as normal, stopping multiple evaluation
+ factory( jQuery, jQuery.fn.dataTable );
+}
+
+
+})(window, document);
+
diff --git a/inst/www/shared/datatables/upgrade1.10.txt b/inst/www/shared/datatables/upgrade1.10.txt
new file mode 100644
index 0000000..9a88787
--- /dev/null
+++ b/inst/www/shared/datatables/upgrade1.10.txt
@@ -0,0 +1,95 @@
+aaData data
+aaSorting order
+aaSortingFixed orderFixed
+aDataSort columns.orderData
+aLengthMenu lengthMenu
+aoSearchCols searchCols
+asSorting columns.orderSequence
+asStripeClasses stripeClasses
+bAutoWidth autoWidth
+bDeferRender deferRender
+bDestroy destroy
+bFilter searching
+bInfo info
+bJQueryUI jQueryUI
+bLengthChange lengthChange
+bPaginate paging
+bProcessing processing
+bRetrieve retrieve
+bScrollAutoCss Removed
+bScrollCollapse scrollCollapse
+bScrollInfinite Removed
+bSearchable columns.searchable
+bServerSide serverSide
+bSort ordering
+bSortable columns.orderable
+bSortCellsTop orderCellsTop
+bSortClasses orderClasses
+bStateSave stateSave
+bUseRendered Removed
+bVisible columns.visible
+fnCookieCallback Removed
+fnCreatedCell columns.createdCell
+fnCreatedRow createdRow
+fnDrawCallback drawCallback
+fnFooterCallback footerCallback
+fnFormatNumber formatNumber
+fnHeaderCallback headerCallback
+fnInfoCallback infoCallback
+fnInitComplete initComplete
+fnPreDrawCallback preDrawCallback
+fnRender Removed
+fnRowCallback rowCallback
+fnServerData ajax
+fnServerParams ajax
+fnStateLoad stateLoadCallback
+fnStateLoaded stateLoaded
+fnStateLoadParams stateLoadParams
+fnStateSave stateSaveCallback
+fnStateSaveParams stateSaveParams
+iCookieDuration stateDuration
+iDataSort columns.orderData
+iDeferLoading deferLoading
+iDisplayLength pageLength
+iDisplayStart displayStart
+iScrollLoadGap Removed
+iTabIndex tabIndex
+mData columns.data
+mRender columns.render
+oLanguage.oAria.sSortAscending language.aria.sortAscending
+oLanguage.oAria.sSortDescending language.aria.sortDescending
+oLanguage.oPaginate.sFirst language.paginate.first
+oLanguage.oPaginate.sLast language.paginate.last
+oLanguage.oPaginate.sNext language.paginate.next
+oLanguage.oPaginate.sPrevious language.paginate.previous
+oLanguage.sEmptyTable language.emptyTable
+oLanguage.sInfo language.info
+oLanguage.sInfoEmpty language.infoEmpty
+oLanguage.sInfoFiltered language.infoFiltered
+oLanguage.sInfoPostFix language.infoPostFix
+oLanguage.sInfoThousands language.thousands
+oLanguage.sLengthMenu language.lengthMenu
+oLanguage.sLoadingRecords language.loadingRecords
+oLanguage.sProcessing language.processing
+oLanguage.sSearch language.search
+oLanguage.sUrl language.url
+oLanguage.sZeroRecords language.zeroRecords
+oSearch search
+sAjaxDataProp ajax.dataSrc
+sAjaxSource ajax
+sCellType columns.cellType
+sClass columns.className
+sContentPadding contentPadding
+sCookiePrefix Removed
+sDefaultContent columns.defaultContent
+sDom dom
+sName columns.name
+sPaginationType pagingType
+sScrollX scrollX
+sScrollXInner scrollXInner
+sScrollY scrollY
+sServerMethod ajax
+sSortDataType columns.orderDataType
+sTitle columns.title
+sType columns.type
+sWidth columns.width
diff --git a/inst/www/shared/shiny.min.js b/inst/www/shared/shiny.min.js
index 72f967d..ec2f46e 100644
--- a/inst/www/shared/shiny.min.js
+++ b/inst/www/shared/shiny.min.js
@@ -1,4 +1,4 @@
-/*! shiny 0.13.1 | (c) 2012-2016 RStudio, Inc. | License: GPL-3 | file LICENSE */
+/*! shiny 0.13.2 | (c) 2012-2016 RStudio, Inc. | License: GPL-3 | file LICENSE */
!function(){function escapeHTML(a){return a.replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,""").replace(/'/g,"'").replace(/\//g,"/")}function randomId(){return Math.floor(4294967296+64424509440*Math.random()).toString(16)}function strToBool(a){if(!a||!a.toLowerCase)return void 0;switch(a.toLowerCase()){case"true":return!0;case"false":return!1;default:return void 0}}function getStyle(a,b){var c;if(a.currentStyle)c=a.currentStyle[b];else if(wind [...]
d.direction=c.brushDirection,d.brushId=a,d.outputId=e,exports.onInputChange(a,d),b.data("mostRecentBrush",!0),imageOutputBinding.find(document).trigger("shiny-internal:brushed",d)}function h(a){if(!(r.isBrushing()||r.isDragging()||r.isResizing())&&1===a.which){var b=d.mouseOffset(a);if(!c.brushClip||d.isInPanel(b,q))if(r.up({x:NaN,y:NaN}),r.down(b),r.isInResizeArea(b))r.startResizing(b),$(document).on("mousemove.image_brush",l).on("mouseup.image_brush",o);else if(r.isInsideBrush(b))r.sta [...]
diff --git a/man/htmlTemplate.Rd b/man/htmlTemplate.Rd
index b1fa420..66a7557 100644
--- a/man/htmlTemplate.Rd
+++ b/man/htmlTemplate.Rd
@@ -2,13 +2,17 @@
\alias{htmlTemplate}
\title{Process an HTML template}
\usage{
-htmlTemplate(filename, ..., document_ = "auto")
+htmlTemplate(filename = NULL, ..., text_ = NULL, document_ = "auto")
}
\arguments{
-\item{filename}{Path to an HTML template file.}
+\item{filename}{Path to an HTML template file. Incompatible with
+\code{text_}.}
\item{...}{Variable values to use when processing the template.}
+\item{text_}{A string to use as the template, instead of a file. Incompatible
+with \code{filename}.}
+
\item{document_}{Is this template a complete HTML document (\code{TRUE}), or
a fragment of HTML that is to be inserted into an HTML document
(\code{FALSE})? With \code{"auto"} (the default), auto-detect by searching
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-shiny.git
More information about the debian-med-commit
mailing list