Merge branch 'texttemplate-meta' into texttemplate

Author: antoinerg

src/traces/scattergl/convert.js

@@ -122,13 +122,13 @@ function convertTextStyle(trace, gd) {
             for(i = 0; i < Math.min(texttemplate.length, count); i++) {
                 pt = {};
                 appendArrayPointValue(pt, trace, i);
-                optsOut.text.push(Lib.texttemplateString(texttemplate[i], pt, d3locale, pt));
+                optsOut.text.push(Lib.texttemplateString(texttemplate[i], pt, d3locale, pt, trace._meta || {}));
             }
         } else {
             for(i = 0; i < count; i++) {
                 pt = {};
                 appendArrayPointValue(pt, trace, i);
-                optsOut.text.push(Lib.texttemplateString(texttemplate, pt, d3locale, pt));
+                optsOut.text.push(Lib.texttemplateString(texttemplate, pt, d3locale, pt, trace._meta || {}));
             }
         }
     } else {

test/jasmine/assets/check_texttemplate.js

@@ -22,15 +22,26 @@ module.exports = function checkTextTemplate(mock, selector, tests) {
         expect(gd._fullData[0].textinfo).toBe(undefined);
     });
 
-    // Generate customdata
+
     var N = tests[0][1].length;
+    var i;
+
+    // Generate customdata
     var customdata = [];
-    for(var i = 0; i < N; i++) {
+    for(i = 0; i < N; i++) {
         customdata.push(Lib.randstr({}));
     }
     mock[0].customdata = customdata;
     tests.push(['%{customdata}', customdata]);
 
+    // Generate meta
+    mock[0].meta = {'colname': 'A'};
+    var metaSolution = [];
+    for(i = 0; i < N; i++) {
+        metaSolution.push(mock[0].meta.colname);
+    }
+    tests.push(['%{meta.colname}', metaSolution]);
+
     if(isGL) {
         tests.forEach(function(test) {
             it('@gl should support texttemplate', function(done) {