Skip to content

Commit 4d2ad95

Browse files
committedJul 4, 2019
use default valueformat if emptry string is provided
1 parent 2c378e0 commit 4d2ad95

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed
 

‎src/traces/indicator/defaults.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
3939
var bignumberFontSize;
4040
if(traceOut._hasNumber) {
4141
coerce('number.valueformat');
42+
if(!traceOut.number.valueformat) traceOut.number.valueformat = attributes.number.valueformat.dflt;
4243
coerce('number.font.color', layout.font.color);
4344
coerce('number.font.family', layout.font.family);
4445
coerce('number.font.size');
@@ -63,7 +64,8 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
6364
}
6465
coerce('delta.reference', traceOut.value);
6566
coerce('delta.relative');
66-
coerce('delta.valueformat', traceOut.delta.relative ? '+2%' : '+.3s');
67+
coerce('delta.valueformat');
68+
if(!traceOut.delta.valueformat) traceOut.delta.valueformat = traceOut.delta.relative ? '+2%' : '+.3s';
6769
coerce('delta.increasing.symbol');
6870
coerce('delta.increasing.color');
6971
coerce('delta.decreasing.symbol');

‎test/jasmine/tests/indicator_test.js

+6
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ describe('Indicator defaults', function() {
5050
expect(out.delta.valueformat).toBe('+2%');
5151
});
5252

53+
it('ignores empty valueformat', function() {
54+
var out = _supply({type: 'indicator', mode: 'number+delta', number: {valueformat: ''}, delta: {valueformat: ''}, value: 1});
55+
expect(out.delta.valueformat).toBe('+.3s');
56+
expect(out.number.valueformat).toBe('.3s');
57+
});
58+
5359
it('defaults delta.reference to current value', function() {
5460
var out = _supply({type: 'indicator', mode: 'delta', value: 1});
5561
expect(out.delta.reference).toBe(1);

1 commit comments

Comments
 (1)

etpinard commented on Jul 8, 2019

@etpinard
Contributor

Hmm. I'm not sure I like this, I would prefer if *tickformat: '' would result in the default Axes.tickText formatting. I know you like .3s to keep a somewhat fixed number bbox during animations, but no all indicator traces will be used with animations. So, I think I'd be nice to have a way to format the numbers like we currently for axis tick labels.

Please sign in to comment.