Skip to content

Commit

Permalink
Require fontwawesome >= v0.3.0 to use version v6 icons (#87)
Browse files Browse the repository at this point in the history
  • Loading branch information
schloerke authored Sep 26, 2022
1 parent 326c52e commit c9c14bb
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .lintr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
linters: with_defaults(
linters: linters_with_defaults(
line_length_linter(100)
)
exclusions: list(
Expand Down
5 changes: 3 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: reactlog
Title: Reactivity Visualizer for 'shiny'
Version: 1.1.0
Version: 1.1.1
Authors@R: c(
person(
"Barret", "Schloerke", email = "[email protected]", role = c("aut", "cre"),
Expand All @@ -22,14 +22,15 @@ Imports:
jsonlite (>= 0.9.16),
Suggests:
shiny (>= 1.5.0),
fontawesome (>= 0.3.0),
knitr,
rmarkdown,
htmltools,
testthat
License: GPL-3 | file LICENSE
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.1.2
RoxygenNote: 7.2.1
URL: https://rstudio.github.io/reactlog/, https://github.com/rstudio/reactlog, https://community.rstudio.com/tags/reactlog
BugReports: https://github.com/rstudio/reactlog/issues
VignetteBuilder: knitr
Expand Down
10 changes: 6 additions & 4 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
reactlog 1.1.0
==========================
# reactlog 1.1.1

- Fixed Font Awesome icon warning about `refresh` icon (#87)

# reactlog 1.1.0

- Added a shiny module to inline the current `reactlog`. See `?reactlog_module_ui` for an example (#66)
- Added `reactlog_enable()` and `reactlog_disable()` which replace the need to explicitly set R options (#61)
- Use log entry for status bar instead of a final graph (#67)
- Allow reactlog to handle isolate calls in a non-reactive context (#68)


reactlog 1.0.0
==========================
# reactlog 1.0.0

Initialize package
2 changes: 1 addition & 1 deletion R/shinyModule.R
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ reactlog_module_ui <- function(include_refresh = TRUE, id = "reactlog_module") {
shiny::actionButton(
ns("refresh"),
"",
icon = shiny::icon("refresh"),
icon = shiny::icon("arrows-rotate", lib = "font-awesome"),
class = "btn-sm btn-warning"
),
shiny::uiOutput(ns("iframe"))
Expand Down
2 changes: 1 addition & 1 deletion R/showReactLog.R
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ reactlog_show <- function(log, time = TRUE, ...) {
#' @param session_token Session token identifier to be used when subsetting the
#' complete reactlog
#' @export
reactlog_write <- function(log, file=stdout(), session_token = NULL) {
reactlog_write <- function(log, file = stdout(), session_token = NULL) {
if (!is.null(session_token)) {
log <- Filter(
function(x) {
Expand Down
16 changes: 8 additions & 8 deletions inst/reactlog/reactlogAsset/reactlog.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/reactlog/reactlogAsset/reactlog.js.map

Large diffs are not rendered by default.

File renamed without changes.
4 changes: 2 additions & 2 deletions vignettes/reactlog.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ vignette: >
knitr::opts_chunk$set(
collapse = TRUE,
comment = "#>",
fig.align="center",
out.width="80%",
fig.align = "center",
out.width = "80%",
echo = FALSE
)
```
Expand Down

0 comments on commit c9c14bb

Please sign in to comment.