From ca8372d512eb9f39527f1c8579d60a5f07679dec Mon Sep 17 00:00:00 2001 From: hlageek <22201406+hlageek@users.noreply.github.com> Date: Sun, 19 May 2024 14:04:08 +0200 Subject: [PATCH 1/3] escape html in raw text Fixes #143. P.S.: Please bump version bug counter when merging (I think that is more consistent than bumping versions inside PRs, which may not be aware of other PRs). --- R/mod_document_code_utils_document_code.R | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/R/mod_document_code_utils_document_code.R b/R/mod_document_code_utils_document_code.R index 80be4044..d0176043 100644 --- a/R/mod_document_code_utils_document_code.R +++ b/R/mod_document_code_utils_document_code.R @@ -315,7 +315,7 @@ load_doc_to_display <- function(pool, blend_colors, code_names) ) - + content_df <- coded_segments %>% dplyr::filter(segment_start <= segment_end) %>% # patch for failing calculate_code_overlap() function in case of identical code positions dplyr::mutate(code_id = as.character(code_id)) %>% @@ -363,11 +363,11 @@ load_doc_to_display <- function(pool, content_df$position_end, content_df$tag), ~paste0(..3, - substr( + htmltools::htmlEscape(substr( raw_text, ..1, - ..2))), + ..2)))), collapse = "") %>% stringr::str_replace_all("[\\n\\r]", "\\​

") @@ -379,7 +379,7 @@ load_doc_to_display <- function(pool, df_non_coded <- paste0( "

", - raw_text %>% + htmltools::htmlEscape(raw_text) %>% stringr::str_replace_all("[\\n\\r]", "\\​

"), From 2f7e5e05cd94423ce3a4107d3f230b89fa66aad3 Mon Sep 17 00:00:00 2001 From: hlageek <22201406+hlageek@users.noreply.github.com> Date: Sun, 19 May 2024 17:55:02 +0200 Subject: [PATCH 2/3] Create favicon.ico --- inst/app/www/favicon.ico | Bin 0 -> 15406 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 inst/app/www/favicon.ico diff --git a/inst/app/www/favicon.ico b/inst/app/www/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1c6f5005f5f604639dec6697ff2b3a4920d6c4ea GIT binary patch literal 15406 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 btmUNM_xs__1nT&ATIOx#^M`T&-xByQ4tEU! literal 0 HcmV?d00001 From 087697541f01ca390e2b9bd25ff37d24ea0f07f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20=C5=A0kvr=C5=88=C3=A1k?= Date: Sun, 19 May 2024 21:29:23 +0200 Subject: [PATCH 3/3] Bump version --- DESCRIPTION | 2 +- tests/test_basic.requal | Bin 106496 -> 106496 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 267f8891..d254a0e7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: requal Title: Shiny Application for Computer-Assisted Qualitative Data Analysis -Version: 1.1.2 +Version: 1.1.2.9002 Authors@R: c( person(given = "Radim", diff --git a/tests/test_basic.requal b/tests/test_basic.requal index 61b9ab5207355e07383dad1829bb2871f76c1db6..476307c693020729145587671710e27cf8dbce9a 100644 GIT binary patch delta 99 zcmZoTz}9epZ39~Y#|j4iGQJqz6`KVGX7Ns5S-V);Qo+d3%E-jZ*ig^J)WpKvq)D8K uos(0wIni-)dfk6PxV(X$rG<&5vFYZr`UU|mO9ewqur`CH3Ckuh3IG7GMH}w` delta 98 zcmZoTz}9epZ39~Y$4UnNGQL>em74_xX7f&7QM*{$Lc!43%E-XV*i6sD(#Y7rs7Z{8 pos(0wInjP{THSvEBzY4PBSVwTW%UgLTtHDnh_0py%O)@i005Ht8=3$B