Skip to content

Commit

Permalink
No more need for bs3compat.js (or downloading JSX implementation)
Browse files Browse the repository at this point in the history
  • Loading branch information
cpsievert committed Apr 26, 2022
1 parent 93d31e0 commit 083573b
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 288 deletions.
12 changes: 1 addition & 11 deletions scripts/htmlDependencies.R
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,4 @@ withr::with_options(
lapply(deps, copyDependencyToDir, "shiny/www/shared")
)

# For JSX based nav() implementation
bslib <- file.path(www, "shared", "bslib")
dir.create(bslib)
withr::with_tempdir({
cmd <- paste("git clone --depth 1 --branch jsx https://github.com/rstudio/bslib")
system(cmd)
file.copy(
"bslib/inst/navs/dist",
bslib, recursive = TRUE
)
})
unlink("shiny/www/shared/bs3compat/", recursive = TRUE)
14 changes: 1 addition & 13 deletions shiny/ui/_html_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from ..html_dependencies import jquery_deps


def bootstrap_deps(bs3compat: bool = True) -> List[HTMLDependency]:
def bootstrap_deps() -> List[HTMLDependency]:
dep = HTMLDependency(
name="bootstrap",
version="5.0.1",
Expand All @@ -14,21 +14,9 @@ def bootstrap_deps(bs3compat: bool = True) -> List[HTMLDependency]:
stylesheet={"href": "bootstrap.min.css"},
)
deps = [jquery_deps(), dep]
if bs3compat:
deps.append(bs3compat_deps())
return deps


# TODO: if we want to support glyphicons we'll need to bundle font files, too
def bs3compat_deps() -> HTMLDependency:
return HTMLDependency(
name="bs3-compat",
version="1.0",
source={"package": "shiny", "subdir": "www/shared/bs3compat/"},
script=[{"src": "transition.js"}, {"src": "tabs.js"}, {"src": "bs3compat.js"}],
)


def ionrangeslider_deps() -> List[HTMLDependency]:
return [
HTMLDependency(
Expand Down
48 changes: 0 additions & 48 deletions shiny/www/shared/bs3compat/bs3compat.js

This file was deleted.

157 changes: 0 additions & 157 deletions shiny/www/shared/bs3compat/tabs.js

This file was deleted.

59 changes: 0 additions & 59 deletions shiny/www/shared/bs3compat/transition.js

This file was deleted.

0 comments on commit 083573b

Please sign in to comment.