Skip to content

Commit b4caa91

Browse files
schloerkecpsievert
andauthored
Distribute TypeScript code into separate files (#3317)
Co-authored-by: Barret Schloerke <[email protected]> Co-authored-by: Carson Sievert <[email protected]>
1 parent dcca77c commit b4caa91

File tree

115 files changed

+24325
-15794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+24325
-15794
lines changed

DESCRIPTION

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: shiny
22
Type: Package
33
Title: Web Application Framework for R
4-
Version: 1.6.0.9001
4+
Version: 1.6.0.9021
55
Authors@R: c(
66
person("Winston", "Chang", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0002-1576-2126")),
77
person("Joe", "Cheng", role = "aut", email = "[email protected]"),
@@ -199,7 +199,11 @@ Collate:
199199
'test.R'
200200
'update-input.R'
201201
'utils-lang.R'
202+
'version_bs_date_picker.R'
203+
'version_ion_range_slider.R'
202204
'version_jquery.R'
205+
'version_selectize.R'
206+
'version_strftime.R'
203207
'viewer.R'
204208
RoxygenNote: 7.1.1
205209
Encoding: UTF-8

R/input-date.R

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,11 @@ dateInput <- function(inputId, label, value = NULL, min = NULL, max = NULL,
133133
}
134134

135135

136-
datePickerVersion <- "1.9.0"
137-
138136
datePickerDependency <- function(theme) {
139137
list(
140138
htmlDependency(
141139
name = "bootstrap-datepicker-js",
142-
version = datePickerVersion,
140+
version = version_bs_date_picker,
143141
src = c(href = "shared/datepicker"),
144142
script = if (getOption("shiny.minified", TRUE)) "js/bootstrap-datepicker.min.js"
145143
else "js/bootstrap-datepicker.js",
@@ -158,7 +156,7 @@ datePickerCSS <- function(theme) {
158156
if (!is_bs_theme(theme)) {
159157
return(htmlDependency(
160158
name = "bootstrap-datepicker-css",
161-
version = datePickerVersion,
159+
version = version_bs_date_picker,
162160
src = c(href = "shared/datepicker"),
163161
stylesheet = "css/bootstrap-datepicker3.min.css"
164162
))
@@ -170,7 +168,7 @@ datePickerCSS <- function(theme) {
170168
input = sass::sass_file(scss_file),
171169
theme = theme,
172170
name = "bootstrap-datepicker",
173-
version = datePickerVersion,
171+
version = version_bs_date_picker,
174172
cache_key_extra = shinyPackageVersion()
175173
)
176174
}

R/input-select.R

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,8 @@ selectizeDependency <- function() {
243243
}
244244

245245
selectizeDependencyFunc <- function(theme) {
246-
selectizeVersion <- "0.12.4"
247246
if (!is_bs_theme(theme)) {
248-
return(selectizeStaticDependency(selectizeVersion))
247+
return(selectizeStaticDependency(version_selectize))
249248
}
250249

251250
selectizeDir <- system.file(package = "shiny", "www/shared/selectize/")
@@ -267,7 +266,7 @@ selectizeDependencyFunc <- function(theme) {
267266
input = sass::sass_file(stylesheet),
268267
theme = theme,
269268
name = "selectize",
270-
version = selectizeVersion,
269+
version = version_selectize,
271270
cache_key_extra = shinyPackageVersion(),
272271
.dep_args = list(script = script)
273272
)

R/input-slider.R

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,16 @@ sliderInput <- function(inputId, label, min, max, value, step = NULL,
201201
}
202202

203203

204-
ionRangeSliderVersion <- "2.3.1"
205-
206204
ionRangeSliderDependency <- function() {
207205
list(
208206
# ion.rangeSlider also needs normalize.css, which is already included in Bootstrap.
209207
htmlDependency(
210-
"ionrangeslider-javascript", ionRangeSliderVersion,
208+
"ionrangeslider-javascript", version_ion_range_slider,
211209
src = c(href = "shared/ionrangeslider"),
212210
script = "js/ion.rangeSlider.min.js"
213211
),
214212
htmlDependency(
215-
"strftime", "0.9.2",
213+
"strftime", version_strftime,
216214
src = c(href = "shared/strftime"),
217215
script = "strftime-min.js"
218216
),
@@ -224,7 +222,7 @@ ionRangeSliderDependencyCSS <- function(theme) {
224222
if (!is_bs_theme(theme)) {
225223
return(htmlDependency(
226224
"ionrangeslider-css",
227-
ionRangeSliderVersion,
225+
version_ion_range_slider,
228226
src = c(href = "shared/ionrangeslider"),
229227
stylesheet = "css/ion.rangeSlider.css"
230228
))
@@ -252,7 +250,7 @@ ionRangeSliderDependencyCSS <- function(theme) {
252250
input = sass_input,
253251
theme = theme,
254252
name = "ionRangeSlider",
255-
version = ionRangeSliderVersion,
253+
version = version_ion_range_slider,
256254
cache_key_extra = shinyPackageVersion()
257255
)
258256
}

R/version_bs_date_picker.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Generated by tools/updateBootstrapDatepicker.R; do not edit by hand
2+
version_bs_date_picker <- "1.9.0"

R/version_ion_range_slider.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Generated by tools/updateIonRangeSlider.R; do not edit by hand
2+
version_ion_range_slider <- "2.3.1"

R/version_selectize.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Generated by tools/updateSelectize.R; do not edit by hand
2+
version_selectize <- "0.12.4"

R/version_strftime.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Generated by tools/updateStrftime.R; do not edit by hand
2+
version_strftime <- "0.9.2"

inst/www/shared/datepicker/js/bootstrap-datepicker.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)