Skip to content

Commit

Permalink
Remove “file =“
Browse files Browse the repository at this point in the history
  • Loading branch information
wch committed Nov 4, 2021
1 parent ed547fd commit 33ed698
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 21 deletions.
6 changes: 3 additions & 3 deletions R/bootstrap.R
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ bootstrapDependency <- function(theme) {
htmlDependency(
"bootstrap",
bootstrapVersion,
c(file = "www/shared/bootstrap"),
src = "www/shared/bootstrap",
package = "shiny",
script = c(
"js/bootstrap.min.js",
Expand Down Expand Up @@ -1110,14 +1110,14 @@ dataTableDependency <- list(
htmlDependency(
"datatables",
"1.10.5",
c(file = "www/shared/datatables"),
src = "www/shared/datatables",
package = "shiny",
script = "js/jquery.dataTables.min.js"
),
htmlDependency(
"datatables-bootstrap",
"1.10.5",
c(file = "www/shared/datatables"),
src = "www/shared/datatables",
package = "shiny",
stylesheet = c("css/dataTables.bootstrap.css", "css/dataTables.extra.css"),
script = "js/dataTables.bootstrap.js"
Expand Down
4 changes: 2 additions & 2 deletions R/input-date.R
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ datePickerDependency <- function(theme) {
htmlDependency(
name = "bootstrap-datepicker-js",
version = version_bs_date_picker,
src = c(file = "www/shared/datepicker"),
src = "www/shared/datepicker",
package = "shiny",
script = if (getOption("shiny.minified", TRUE)) "js/bootstrap-datepicker.min.js"
else "js/bootstrap-datepicker.js",
Expand All @@ -158,7 +158,7 @@ datePickerCSS <- function(theme) {
return(htmlDependency(
name = "bootstrap-datepicker-css",
version = version_bs_date_picker,
src = c(file = "www/shared/datepicker"),
src = "www/shared/datepicker",
package = "shiny",
stylesheet = "css/bootstrap-datepicker3.min.css"
))
Expand Down
2 changes: 1 addition & 1 deletion R/input-select.R
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ selectizeStaticDependency <- function(version) {
htmlDependency(
"selectize",
version,
src = c(file = "www/shared/selectize"),
src = "www/shared/selectize",
package = "shiny",
stylesheet = "css/selectize.bootstrap3.css",
script = c(
Expand Down
6 changes: 3 additions & 3 deletions R/input-slider.R
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,14 @@ ionRangeSliderDependency <- function() {
htmlDependency(
"ionrangeslider-javascript",
version_ion_range_slider,
src = c(file = "www/shared/ionrangeslider"),
src = "www/shared/ionrangeslider",
package = "shiny",
script = "js/ion.rangeSlider.min.js"
),
htmlDependency(
"strftime",
version_strftime,
src = c(file = "www/shared/strftime"),
src = "www/shared/strftime",
package = "shiny",
script = "strftime-min.js"
),
Expand All @@ -227,7 +227,7 @@ ionRangeSliderDependencyCSS <- function(theme) {
return(htmlDependency(
"ionrangeslider-css",
version_ion_range_slider,
src = c(file = "www/shared/ionrangeslider"),
src = "www/shared/ionrangeslider",
package = "shiny",
stylesheet = "css/ion.rangeSlider.css"
))
Expand Down
2 changes: 1 addition & 1 deletion R/jqueryui.R
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jqueryuiDependency <- function() {
htmlDependency(
'jqueryui',
'1.12.1',
c(file = 'www/shared/jqueryui'),
src = 'www/shared/jqueryui',
package = 'shiny',
script = 'jquery-ui.min.js'
)
Expand Down
12 changes: 4 additions & 8 deletions R/shinyui.R
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,15 @@ jqueryDependency <- function() {
if (version == 3) {
return(htmlDependency(
"jquery", version_jquery,
src = c(
file = "www/shared"
),
src = "www/shared",
package = "shiny",
script = "jquery.min.js"
))
}
if (version == 1) {
return(htmlDependency(
"jquery", "1.12.4",
src = c(
file = "www/shared/legacy"
),
src = "www/shared/legacy",
package = "shiny",
script = "jquery.min.js"
))
Expand All @@ -95,7 +91,7 @@ shinyDependencies <- function() {
htmlDependency(
name = "shiny-javascript",
version = shinyPackageVersion(),
src = c(file = "www/shared"),
src = "www/shared",
package = "shiny",
script =
if (isTRUE(
Expand All @@ -118,7 +114,7 @@ shinyDependencyCSS <- function(theme) {
return(htmlDependency(
name = "shiny-css",
version = version,
src = c(file = "www/shared"),
src = "www/shared",
package = "shiny",
stylesheet = "shiny.min.css"
))
Expand Down
6 changes: 3 additions & 3 deletions R/showcase.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,22 @@ showcaseHead <- function() {
htmlDependency(
"showdown",
"0.3.1",
c(file = "www/shared/showdown/compressed"),
src = "www/shared/showdown/compressed",
package="shiny",
script = "showdown.js"
),
htmlDependency(
"highlight.js",
"6.2",
c(file = "www/shared/highlight"),
src = "www/shared/highlight",
package="shiny",
script = "highlight.pack.js",
stylesheet = "rstudio.css"
),
htmlDependency(
"showcase",
"0.1.0",
c(file = "www/shared"),
src = "www/shared",
package = "shiny",
script = "shiny-showcase.js",
stylesheet = "shiny-showcase.css"
Expand Down

0 comments on commit 33ed698

Please sign in to comment.