image: in hovertemplate, rename c to color

Author: antoinerg

src/traces/image/attributes.js

@@ -102,6 +102,6 @@ module.exports = extendFlat({
         flags: ['x', 'y', 'z', 'color', 'name']
     }),
     hovertemplate: hovertemplateAttrs({}, {
-        keys: ['z', 'c', 'colormodel']
+        keys: ['z', 'color', 'colormodel']
     })
 });

src/traces/image/event_data.js

@@ -9,11 +9,11 @@
 'use strict';
 
 module.exports = function eventData(out, pt) {
-    out.colormodel = pt.trace.colormodel;
     if('xVal' in pt) out.x = pt.xVal;
     if('yVal' in pt) out.y = pt.yVal;
     if(pt.xa) out.xaxis = pt.xa;
     if(pt.ya) out.yaxis = pt.ya;
-    out.c = pt.c;
+    out.color = pt.color;
+    out.colormodel = pt.trace.colormodel;
     return out;
 };

src/traces/image/hover.js

@@ -63,18 +63,19 @@ module.exports = function hoverPoints(pointData, xval, yval) {
         x1: xa.c2p(cd0.x0 + (nx + 1) * trace.dx),
         y0: py,
         y1: py,
-        c: c,
+        color: c,
         xVal: xVal,
         xLabelVal: xVal,
         yVal: yVal,
         yLabelVal: yVal,
         zLabelVal: zLabel,
         hovertemplateLabels: {
             'zLabel': zLabel,
-            'cLabel': colorstring,
-            'c[0]Label': c[0] + s[0],
-            'c[1]Label': c[1] + s[1],
-            'c[2]Label': c[2] + s[2]
+            'colorLabel': colorstring,
+            'color[0]Label': c[0] + s[0],
+            'color[1]Label': c[1] + s[1],
+            'color[2]Label': c[2] + s[2],
+            'color[3]Label': c[3] + s[3]
         }
     })];
 };

test/jasmine/tests/image_test.js

@@ -397,12 +397,12 @@ describe('image hover:', function() {
           ['x', '25.5'],
           ['y', '14.5'],
           ['z', '[54, 136, 153]'],
-          ['c', '[54, 136, 153]'],
-          ['c[0]', '54'],
-          ['c[0]', '54°', 'hsl'],
-          ['c[1]', '100%', 'hsl'],
-          ['c[2]', '100%', 'hsl'],
-          ['c[3]', '1', 'hsla'],
+          ['color', '[54, 136, 153]'],
+          ['color[0]', '54'],
+          ['color[0]', '54°', 'hsl'],
+          ['color[1]', '100%', 'hsl'],
+          ['color[2]', '100%', 'hsl'],
+          ['color[3]', '1', 'hsla'],
         ].forEach(function(test) {
             it('should support hovertemplate variable ' + test[0], function(done) {
                 var mockCopy = Lib.extendDeep({}, mock);