Skip to content

Commit e5dcd5e

Browse files
committed
Replace spaces with underscores when mapping filenames to ids in the showcase, closes #1926
1 parent b889b0d commit e5dcd5e

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

R/showcase.R

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ navTabsHelper <- function(files, prefix = "") {
8282
lapply(files, function(file) {
8383
with(tags,
8484
li(class=if (tolower(file) %in% c("app.r", "server.r")) "active" else "",
85-
a(href=paste("#", gsub(".", "_", file, fixed=TRUE), "_code", sep=""),
85+
a(href=paste0("#", gsub("\\.|\\s+", "_", file), "_code"),
8686
"data-toggle"="tab", paste0(prefix, file)))
8787
)
8888
})
@@ -105,12 +105,11 @@ navTabsDropdown <- function(files) {
105105
tabContentHelper <- function(files, path, language) {
106106
lapply(files, function(file) {
107107
with(tags,
108-
div(class=paste("tab-pane",
108+
div(class=paste0("tab-pane",
109+
# TODO: what if the app filename is something else?
109110
if (tolower(file) %in% c("app.r", "server.r")) " active"
110-
else "",
111-
sep=""),
112-
id=paste(gsub(".", "_", file, fixed=TRUE),
113-
"_code", sep=""),
111+
else ""),
112+
id=paste0(gsub("\\.|\\s+", "_", file), "_code"),
114113
pre(class="shiny-code",
115114
# we need to prevent the indentation of <code> ... </code>
116115
HTML(format(tags$code(

inst/www/shared/shiny-showcase.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
el = document.createElement("span");
8383
el.id = "srcref_" + srcref;
8484
var ref = srcref;
85-
var code = document.getElementById(srcfile.replace(/\./g, "_") + "_code");
85+
var code = document.getElementById(srcfile.replace(/\.|\s+/g, "_") + "_code");
8686
// if there is no code file (might be a shiny file), quit early
8787
if (!code) return;
8888
var start = findTextPoint(code, ref[0], ref[4]);

0 commit comments

Comments
 (0)