Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
66da59e
remove crosstalk
JohnCoene Apr 18, 2021
d6364f8
change device argument to NULL
JohnCoene Apr 18, 2021
d769261
improve flex
JohnCoene May 13, 2021
f0c04f3
rename columns to avoid clash
JohnCoene May 13, 2021
9f0e041
nowrap
JohnCoene May 13, 2021
8ea304e
add padding on columns
JohnCoene May 13, 2021
f734551
revert columns to use Bootrap's
JohnCoene Jun 1, 2021
8ae021d
init tools, revert crosstalk.css
JohnCoene Jun 1, 2021
713c582
correct dependency name
JohnCoene Jun 2, 2021
dfa4cc6
works with bootstrap 4 but need revert to 3 to avoid clash
JohnCoene Jun 4, 2021
7fd68e7
include bs3 scaffolding scss to grid: 12-column grid works\!
JohnCoene Jun 4, 2021
822e711
update NEWS
JohnCoene Jun 7, 2021
a3d36b4
support default selected value in filter_selec
JohnCoene Jun 10, 2021
c676508
revert changes to filter_select
JohnCoene Jun 10, 2021
a16e2a0
process to upgrade selectize
JohnCoene Jun 13, 2021
708ba27
css styling for radio, and checkbox
JohnCoene Jun 13, 2021
fa4d2d1
remove erroneous 'deprecated' device
JohnCoene Jun 15, 2021
df5af32
bump selectize htmlDependency version
JohnCoene Jun 15, 2021
e17cd2f
update NEWS: selectize.js version bumped
JohnCoene Jun 15, 2021
7f0ad5b
remove script to update ionRangeSlider
JohnCoene Jun 15, 2021
9d8fc77
remove normalize.css from ionRangeSlider dependency
JohnCoene Jun 15, 2021
ab1ae6d
correct selectize.js version in htmlDependency
JohnCoene Jun 15, 2021
1b69035
Reduce git diff
cpsievert Jun 15, 2021
5b99e33
Update NEWS.md
cpsievert Jun 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
^coverage$
^.nvmrc$
^\.github$
^tools$
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
## crosstalk 1.1.1.9000

### Breaking changes

* Removed the Bootstrap HTML dependency attached to `filter_select()`, `filter_checkbox()`, and `bscols()`. This allows `{crosstalk}` to be used in a non-Bootstrap CSS framework (e.g., `{distill}`) without de-grading the overall look. If this change happens to break functionality or de-grade the overall appearance of your `{crosstalk}` site, consider adding `bslib::bs_theme_dependencies(bslib::theme(version = 3))` to the UI definition, which will add back the Bootstrap dependency.

### Improvements

* Upgraded `filter_select()`'s selectize.js dependency to v0.12.4.

## crosstalk 1.1.1

Expand Down
24 changes: 10 additions & 14 deletions R/controls.R
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
bootstrapLib <- function(theme = NULL) {
# Intentionally use an older version of bootstrap. The rendering
# environment may use a bootstrap version that has a theme, and
# we don't want to trump that just for our little controls.
# Ideally we should find a better solution for this.
bootstrapLib <- function() {
# we only import the grid
htmlDependency(
name = "bootstrap",
version = "3.3.2",
name = "bootstrap-grid",
version = "3.4.1", # must be updated with tools/updateBootstrapGrid.R
package = "crosstalk",
src = file.path("lib", "bootstrap"),
script = "js/bootstrap.min.js",
stylesheet = if (is.null(theme)) "css/bootstrap.min.css",
src = "lib/bootstrap",
stylesheet = "bootstrap-grid.min.css",
meta = list(viewport = "width=device-width, initial-scale=1")
)
}

selectizeLib <- function(bootstrap = TRUE) {
htmlDependency(
name = "selectize",
version = "0.11.2",
version = "0.12.4",
package = "crosstalk",
src = "lib/selectize",
stylesheet = if (bootstrap) "css/selectize.bootstrap3.css",
Expand Down Expand Up @@ -143,7 +139,7 @@ filter_select <- function(id, label, sharedData, group, allLevels = FALSE,
)
)
),
c(list(jqueryLib(), bootstrapLib(), selectizeLib()), crosstalkLibs())
c(list(jqueryLib(), selectizeLib()), crosstalkLibs())
))
}

Expand Down Expand Up @@ -192,7 +188,7 @@ filter_checkbox <- function(id, label, sharedData, group, allLevels = FALSE, inl
jsonlite::toJSON(options, dataframe = "columns", pretty = TRUE)
)
),
c(list(jqueryLib(), bootstrapLib()), crosstalkLibs())
c(list(jqueryLib()), crosstalkLibs())
))
}

Expand Down Expand Up @@ -544,7 +540,7 @@ bscols <- function(..., widths = NA, device = c("xs", "sm", "md", "lg")) {

ui <- tags$div(class = "container-fluid crosstalk-bscols",
# Counteract knitr pre/code output blocks
tags$div(class = "fluid-row",
tags$div(class = "row",
Comment thread
cpsievert marked this conversation as resolved.
unname(mapply(list(...), widths, FUN = function(el, width) {
div(class = sprintf("col-%s-%s", device, width),
el
Expand Down
1 change: 1 addition & 0 deletions inst/lib/bootstrap/bootstrap-grid.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading