Merge branch 'master' into funnelarea-traces

Author: etpinard

src/components/annotations/draw.js

@@ -212,8 +212,8 @@ function drawRaw(gd, options, index, subplotId, xa, ya) {
 
     var font = options.font;
 
-    var text = fullLayout.meta ?
-        Lib.templateString(options.text, {meta: fullLayout.meta}) :
+    var text = fullLayout._meta ?
+        Lib.templateString(options.text, fullLayout._meta) :
         options.text;
 
     var annText = annTextGroupInner.append('text')

src/components/colorbar/draw.js

@@ -140,6 +140,7 @@ function makeColorBarData(gd) {
                     opts._id = 'cb' + trace.uid + (allowsMultiplotCbs && contName ? '-' + contName : '');
                     opts._traceIndex = trace.index;
                     opts._propPrefix = (contName ? contName + '.' : '') + 'colorbar.';
+                    opts._meta = trace._meta;
                     calcOpts();
                     out.push(opts);
                 }
@@ -156,6 +157,7 @@ function makeColorBarData(gd) {
             opts = initOpts(cont.colorbar);
             opts._id = 'cb' + k;
             opts._propPrefix = k + '.colorbar.';
+            opts._meta = fullLayout._meta;
 
             cbOpt = {min: 'cmin', max: 'cmax'};
             if(colorAxOpts[0] !== 'heatmap') {
@@ -281,6 +283,7 @@ function drawColorBar(g, opts, gd) {
             propContainer: ax,
             propName: opts._propPrefix + 'title',
             traceIndex: opts._traceIndex,
+            _meta: opts._meta,
             placeholder: fullLayout._dfltTitle.colorbar,
             containerGroup: g.select('.' + cn.cbtitle)
         };

src/components/fx/hover.js

@@ -887,8 +887,8 @@ function createHoverText(hoverData, opts, gd) {
         if(d.nameOverride !== undefined) d.name = d.nameOverride;
 
         if(d.name) {
-            if(fullLayout.meta) {
-                d.name = Lib.templateString(d.name, {meta: fullLayout.meta});
+            if(d.trace._meta) {
+                d.name = Lib.templateString(d.name, d.trace._meta);
             }
             name = plainText(d.name, d.nameLength);
         }
@@ -925,7 +925,7 @@ function createHoverText(hoverData, opts, gd) {
         }
 
         // hovertemplate
-        var d3locale = gd._fullLayout._d3locale;
+        var d3locale = fullLayout._d3locale;
         var hovertemplate = d.hovertemplate || false;
         var hovertemplateLabels = d.hovertemplateLabels || d;
         var eventData = d.eventData[0] || {};
@@ -935,7 +935,7 @@ function createHoverText(hoverData, opts, gd) {
                 hovertemplateLabels,
                 d3locale,
                 eventData,
-                {meta: fullLayout.meta}
+                d.trace._meta
             );
 
             text = text.replace(EXTRA_STRING_REGEX, function(match, extra) {

src/components/legend/attributes.js

@@ -90,6 +90,33 @@ module.exports = {
         ].join(' ')
     },
 
+    itemclick: {
+        valType: 'enumerated',
+        values: ['toggle', 'toggleothers', false],
+        dflt: 'toggle',
+        role: 'info',
+        editType: 'legend',
+        description: [
+            'Determines the behavior on legend item click.',
+            '*toggle* toggles the visibility of the item clicked on the graph.',
+            '*toggleothers* makes the clicked item the sole visible item on the graph.',
+            '*false* disable legend item click interactions.'
+        ].join(' ')
+    },
+    itemdoubleclick: {
+        valType: 'enumerated',
+        values: ['toggle', 'toggleothers', false],
+        dflt: 'toggleothers',
+        role: 'info',
+        editType: 'legend',
+        description: [
+            'Determines the behavior on legend item double-click.',
+            '*toggle* toggles the visibility of the item clicked on the graph.',
+            '*toggleothers* makes the clicked item the sole visible item on the graph.',
+            '*false* disable legend item double-click interactions.'
+        ].join(' ')
+    },
+
     x: {
         valType: 'number',
         min: -2,

src/components/legend/defaults.js

@@ -103,6 +103,9 @@ module.exports = function legendDefaults(layoutIn, layoutOut, fullData) {
 
     coerce('itemsizing');
 
+    coerce('itemclick');
+    coerce('itemdoubleclick');
+
     coerce('x', defaultX);
     coerce('xanchor', defaultXAnchor);
     coerce('y', defaultY);

src/components/legend/draw.js

@@ -404,8 +404,8 @@ function drawTexts(g, gd, maxLength) {
     var isEditable = gd._context.edits.legendText && !isPieLike;
 
     var name = isPieLike ? legendItem.label : trace.name;
-    if(fullLayout.meta) {
-        name = Lib.templateString(name, {meta: fullLayout.meta});
+    if(trace._meta) {
+        name = Lib.templateString(name, trace._meta);
     }
 
     var textEl = Lib.ensureSingle(g, 'text', 'legendtext');

src/components/legend/handle_click.js

@@ -14,10 +14,29 @@ var Registry = require('../../registry');
 var SHOWISOLATETIP = true;
 
 module.exports = function handleClick(g, gd, numClicks) {
+    var fullLayout = gd._fullLayout;
+
     if(gd._dragged || gd._editing) return;
 
-    var hiddenSlices = gd._fullLayout.hiddenlabels ?
-        gd._fullLayout.hiddenlabels.slice() :
+    var itemClick = fullLayout.legend.itemclick;
+    var itemDoubleClick = fullLayout.legend.itemdoubleclick;
+
+    if(numClicks === 1 && itemClick === 'toggle' && itemDoubleClick === 'toggleothers' &&
+        SHOWISOLATETIP && gd.data && gd._context.showTips
+    ) {
+        Lib.notifier(Lib._(gd, 'Double-click on legend to isolate one trace'), 'long');
+        SHOWISOLATETIP = false;
+    } else {
+        SHOWISOLATETIP = false;
+    }
+
+    var mode;
+    if(numClicks === 1) mode = itemClick;
+    else if(numClicks === 2) mode = itemDoubleClick;
+    if(!mode) return;
+
+    var hiddenSlices = fullLayout.hiddenlabels ?
+        fullLayout.hiddenlabels.slice() :
         [];
 
     var legendItem = g.data()[0][0];
@@ -85,21 +104,14 @@ module.exports = function handleClick(g, gd, numClicks) {
         }
     }
 
-    if(numClicks === 1 && SHOWISOLATETIP && gd.data && gd._context.showTips) {
-        Lib.notifier(Lib._(gd, 'Double-click on legend to isolate one trace'), 'long');
-        SHOWISOLATETIP = false;
-    } else {
-        SHOWISOLATETIP = false;
-    }
-
     if(Registry.traceIs(fullTrace, 'pie-like')) {
         var thisLabel = legendItem.label;
         var thisLabelIndex = hiddenSlices.indexOf(thisLabel);
 
-        if(numClicks === 1) {
+        if(mode === 'toggle') {
             if(thisLabelIndex === -1) hiddenSlices.push(thisLabel);
             else hiddenSlices.splice(thisLabelIndex, 1);
-        } else if(numClicks === 2) {
+        } else if(mode === 'toggleothers') {
             hiddenSlices = [];
             gd.calcdata[0].forEach(function(d) {
                 if(thisLabel !== d.label) {
@@ -126,7 +138,7 @@ module.exports = function handleClick(g, gd, numClicks) {
             }
         }
 
-        if(numClicks === 1) {
+        if(mode === 'toggle') {
             var nextVisibility;
 
             switch(fullTrace.visible) {
@@ -150,7 +162,7 @@ module.exports = function handleClick(g, gd, numClicks) {
             } else {
                 setVisibility(fullTrace, nextVisibility);
             }
-        } else if(numClicks === 2) {
+        } else if(mode === 'toggleothers') {
             // Compute the clicked index. expandedIndex does what we want for expanded traces
             // but also culls hidden traces. That means we have some work to do.
             var isClicked, isInGroup, otherState;

src/components/rangeselector/draw.js

@@ -149,14 +149,14 @@ function drawButtonText(button, selectorLayout, d, gd) {
     });
 
     text.call(Drawing.font, selectorLayout.font)
-        .text(getLabel(d, gd._fullLayout.meta))
+        .text(getLabel(d, gd._fullLayout._meta))
         .call(textLayout);
 }
 
-function getLabel(opts, meta) {
+function getLabel(opts, _meta) {
     if(opts.label) {
-        return meta ?
-            Lib.templateString(opts.label, {meta: meta}) :
+        return _meta ?
+            Lib.templateString(opts.label, _meta) :
             opts.label;
     }
 

src/components/sliders/draw.js

@@ -315,10 +315,8 @@ function drawCurrentValue(sliderGroup, sliderOpts, valueOverride) {
         str += valueOverride;
     } else {
         var curVal = sliderOpts.steps[sliderOpts.active].label;
-        var meta = sliderOpts._gd._fullLayout.meta;
-        if(meta) {
-            curVal = Lib.templateString(curVal, {meta: meta});
-        }
+        var _meta = sliderOpts._gd._fullLayout._meta;
+        if(_meta) curVal = Lib.templateString(curVal, _meta);
         str += curVal;
     }
 
@@ -367,10 +365,8 @@ function drawLabel(item, data, sliderOpts) {
     });
 
     var tx = data.step.label;
-    var meta = sliderOpts._gd._fullLayout.meta;
-    if(meta) {
-        tx = Lib.templateString(tx, {meta: meta});
-    }
+    var _meta = sliderOpts._gd._fullLayout._meta;
+    if(_meta) tx = Lib.templateString(tx, _meta);
 
     text.call(Drawing.font, sliderOpts.font)
         .text(tx)

src/components/titles/index.js

@@ -53,6 +53,8 @@ var numStripRE = / [XY][0-9]* /;
  *          offset - shift up/down in the rotated frame (unused?)
  *      containerGroup - if an svg <g> element already exists to hold this
  *          title, include here. Otherwise it will go in fullLayout._infolayer
+ *      _meta {object (optional} - meta key-value to for title with
+ *          Lib.templateString, default to fullLayout._meta, if not provided
  *
  *  @return {selection} d3 selection of title container group
  */
@@ -97,8 +99,10 @@ function draw(gd, titleClass, options) {
         if(!editable) txt = '';
     }
 
-    if(fullLayout.meta) {
-        txt = Lib.templateString(txt, {meta: fullLayout.meta});
+    if(options._meta) {
+        txt = Lib.templateString(txt, options._meta);
+    } else if(fullLayout._meta) {
+        txt = Lib.templateString(txt, fullLayout._meta);
     }
 
     var elShouldExist = txt || editable;