refactor

Author: archmoj

src/components/annotations/common_defaults.js

@@ -58,14 +58,12 @@ module.exports = function handleAnnotationCommonDefaults(annIn, annOut, fullLayo
             Color.contrast(hoverBG)
         );
 
-        Lib.coerceFont(coerce, 'hoverlabel.font', {
-            family: globalHoverLabel.font.family,
-            weight: globalHoverLabel.font.weight,
-            style: globalHoverLabel.font.style,
-            variant: globalHoverLabel.font.variant,
-            size: globalHoverLabel.font.size,
-            color: globalHoverLabel.font.color || hoverBorder
-        });
+        var fontDflt = Lib.extendFlat({}, globalHoverLabel.font);
+        if(!fontDflt.color) {
+            fontDflt.color = hoverBorder;
+        }
+
+        Lib.coerceFont(coerce, 'hoverlabel.font', fontDflt);
     }
 
     coerce('captureevents', !!hoverText);

src/components/fx/hover.js

@@ -1017,7 +1017,7 @@ function createHoverText(hoverData, opts) {
             variant: commonLabelOpts.font.variant || fontVariant,
             family: commonLabelOpts.font.family || fontFamily,
             size: commonLabelOpts.font.size || fontSize,
-            color: commonLabelOpts.font.color || contrastColor,
+            color: commonLabelOpts.font.color || contrastColor
         };
 
         lpath.style({