Remove warning when guide functions are used in identity scales (#3131)

clauswilke · web-flow · commit 43dcd632fe96 · 2019-02-12T15:05:44.000-06:00
* properly check for presence/absence of guide. Closes #3127. * use `identical()` instead of `isTRUE()`.
diff --git a/R/scale-identity.r b/R/scale-identity.r
@@ -146,7 +146,7 @@ ScaleDiscreteIdentity <- ggproto("ScaleDiscreteIdentity", ScaleDiscrete,
 
   train = function(self, x) {
     # do nothing if no guide, otherwise train so we know what breaks to use
-    if (self$guide == "none") return()
+    if (identical(self$guide, "none")) return()
     ggproto_parent(ScaleDiscrete, self)$train(x)
   }
 )
@@ -167,7 +167,7 @@ ScaleContinuousIdentity <- ggproto("ScaleContinuousIdentity", ScaleContinuous,
 
   train = function(self, x) {
     # do nothing if no guide, otherwise train so we know what breaks to use
-    if (self$guide == "none") return()
+    if (identical(self$guide, "none")) return()
     ggproto_parent(ScaleContinuous, self)$train(x)
   }
 )

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ ScaleDiscreteIdentity <- ggproto("ScaleDiscreteIdentity", ScaleDiscrete,`
`146`	`146`
`147`	`147`	`train = function(self, x) {`
`148`	`148`	`# do nothing if no guide, otherwise train so we know what breaks to use`
`149`		`- if (self$guide == "none") return()`
	`149`	`+ if (identical(self$guide, "none")) return()`
`150`	`150`	`ggproto_parent(ScaleDiscrete, self)$train(x)`
`151`	`151`	`}`
`152`	`152`	`)`
`@@ -167,7 +167,7 @@ ScaleContinuousIdentity <- ggproto("ScaleContinuousIdentity", ScaleContinuous,`
`167`	`167`
`168`	`168`	`train = function(self, x) {`
`169`	`169`	`# do nothing if no guide, otherwise train so we know what breaks to use`
`170`		`- if (self$guide == "none") return()`
	`170`	`+ if (identical(self$guide, "none")) return()`
`171`	`171`	`ggproto_parent(ScaleContinuous, self)$train(x)`
`172`	`172`	`}`
`173`	`173`	`)`