Skip to content

Commit 6744184

Browse files
committed
Style fixes suggested by winston
1 parent f74891c commit 6744184

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

R/limits.r

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ limits <- function(lims, var) UseMethod("limits")
4747
#' @export
4848
limits.numeric <- function(lims, var) {
4949
stopifnot(length(lims) == 2)
50-
if (sum(is.na(lims)) == 0 &lims[1] > lims[2]) {
50+
if (!any(is.na(lims)) && lims[1] > lims[2]) {
5151
trans <- "reverse"
5252
} else {
5353
trans <- "identity"

R/scale-.r

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,16 @@ scale_limits <- function(scale) {
296296
}
297297

298298

299+
# if scale contains a NULL, use the default scale range
300+
# if scale contains a NA, use the default range for that axis, otherwise
301+
# use the user defined limit for that axis
299302
#' @export
300303
scale_limits.default <- function(scale) {
301-
if(!is.null(scale$limits))
302-
ifelse(!is.na(scale$limits),scale$limits,scale$range$range)
303-
else scale$range$range
304+
if(!is.null(scale$limits)) {
305+
ifelse(!is.na(scale$limits), scale$limits, scale$range$range)
306+
} else {
307+
scale$range$range
308+
}
304309
}
305310

306311
# @kohske

0 commit comments

Comments
 (0)