Conformed with carson's review

Author: moutikabdessabour

R/ggplotly.R

@@ -88,8 +88,6 @@ ggplotly.ggmatrix <- function(p = ggplot2::last_plot(), width = NULL,
                               height = NULL, tooltip = "all", dynamicTicks = FALSE, 
                               layerData = 1, originalData = TRUE, source = "A", ...) {
   dots <- list(...)
-  # rectify tooltips, ggplot automatically convert `color` => `colour`
-  tooltip <- rectify_tooltips(tooltip)
 
   # provide a sensible crosstalk if none is already provided (makes ggnostic() work at least)
   if (!crosstalk_key() %in% names(p$data)) {
@@ -148,8 +146,6 @@ ggplotly.ggmatrix <- function(p = ggplot2::last_plot(), width = NULL,
 ggplotly.ggplot <- function(p = ggplot2::last_plot(), width = NULL,
                             height = NULL, tooltip = "all", dynamicTicks = FALSE,  
                             layerData = 1, originalData = TRUE, source = "A", ...) {
-  # rectify tooltips, ggplot automatically convert `color` => `colour`
-  tooltip <- rectify_tooltips(tooltip)
   l <- gg2list(p, width = width, height = height, tooltip = tooltip, 
                dynamicTicks = dynamicTicks, layerData = layerData, 
                originalData = originalData, source = source, ...)
@@ -1438,8 +1434,3 @@ getAesMap <- function(plot, layer) {
     layer$mapping
   }
 }
-
-rectify_tooltips <- function(tooltip){
-    tooltip[tooltip == "color"] <- "colour"
-    tooltip
-}

R/layers2traces.R

@@ -23,8 +23,11 @@ layers2traces <- function(data, prestats_data, layout, p) {
     # turn symbol (e.g., ..count..) & call (e.g. calc(count)) mappings into text labels 
     map <- ggfun("make_labels")(map)
 
+
     # filter tooltip aesthetics down to those specified in `tooltip` arg 
     if (!identical(p$tooltip, "all")) {
+      # rectify tooltips, ggplot automatically convert `color` => `colour`
+      p$tooltip[p$tooltip == "color"] <- "colour"
       map <- map[names(map) %in% p$tooltip | map %in% p$tooltip]
     }