Skip to content

Commit 042b2ad

Browse files
archmojarchmoj
committed
capitalize > textcase
1 parent 47ebc09 commit 042b2ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+4413
-4413
lines changed

‎src/components/annotations/draw.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ function drawRaw(gd, options, index, subplotId, xa, ya) {
201201
fontVariant: hoverFont.variant,
202202
fontShadow: hoverFont.fontShadow,
203203
fontDecorline: hoverFont.fontDecorline,
204-
fontCapitalize: hoverFont.fontCapitalize,
204+
fontTextcase: hoverFont.fontTextcase,
205205
}, {
206206
container: fullLayout._hoverlayer.node(),
207207
outerContainer: fullLayout._paper.node(),

‎src/components/drawing/index.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ drawing.font = function(s, font) {
3636
var family = font.family;
3737
var shadow = font.shadow;
3838
var decorline = font.decorline;
39-
var capitalize = font.capitalize;
39+
var textcase = font.textcase;
4040

4141
if(family) s.style('font-family', family);
4242
if(size + 1) s.style('font-size', size + 'px');
@@ -46,22 +46,22 @@ drawing.font = function(s, font) {
4646
if(style) s.style('font-style', style);
4747
if(variant) s.style('font-variant', variant);
4848

49-
if(capitalize) s.style('text-transform', capitalize2transform(capitalize));
49+
if(textcase) s.style('text-transform', textcase2transform(textcase));
5050
if(shadow) s.style('text-shadow', shadow === 'auto' ? svgTextUtils.makeTextShadow(Color.contrast(color)) : shadow);
5151
if(decorline) s.style('text-decoration-line', decorline2decorationLine(decorline));
5252
};
5353

54-
var capitalize2transformOptions = {
54+
var textcase2transformOptions = {
5555
normal: 'none',
5656
word: 'capitalize',
5757
lower: 'lowercase',
5858
upper: 'uppercase'
5959
};
6060

61-
function capitalize2transform(capitalize) {
62-
return capitalize2transformOptions[capitalize];
61+
function textcase2transform(textcase) {
62+
return textcase2transformOptions[textcase];
6363
}
64-
drawing.capitalize2transform = capitalize2transform;
64+
drawing.textcase2transform = textcase2transform;
6565

6666
function decorline2decorationLine(decorline) {
6767
return (
@@ -1167,7 +1167,7 @@ drawing.textPointStyle = function(s, trace, gd) {
11671167
weight: d.tw || trace.textfont.weight,
11681168
style: d.ty || trace.textfont.style,
11691169
variant: d.tv || trace.textfont.variant,
1170-
capitalize: d.tC || trace.textfont.capitalize,
1170+
textcase: d.tC || trace.textfont.textcase,
11711171
decorline: d.tE || trace.textfont.decorline,
11721172
shadow: d.tS || trace.textfont.shadow,
11731173
size: fontSize,

‎src/components/fx/hover.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ function createHoverText(hoverData, opts) {
961961
var fontWeight = opts.fontWeight || fullLayout.font.weight;
962962
var fontStyle = opts.fontStyle || fullLayout.font.style;
963963
var fontVariant = opts.fontVariant || fullLayout.font.variant;
964-
var fontCapitalize = opts.fontCapitalize || fullLayout.font.capitalize;
964+
var fontTextcase = opts.fontTextcase || fullLayout.font.textcase;
965965
var fontDecorline = opts.fontDecorline || fullLayout.font.decorline;
966966
var fontShadow = opts.fontShadow || fullLayout.font.shadow;
967967

@@ -1049,7 +1049,7 @@ function createHoverText(hoverData, opts) {
10491049
weight: commonLabelOptsFont.weight || fontWeight,
10501050
style: commonLabelOptsFont.style || fontStyle,
10511051
variant: commonLabelOptsFont.variant || fontVariant,
1052-
capitalize: commonLabelOptsFont.capitalize || fontCapitalize,
1052+
textcase: commonLabelOptsFont.textcase || fontTextcase,
10531053
decorline: commonLabelOptsFont.decorline || fontDecorline,
10541054
shadow: commonLabelOptsFont.shadow || fontShadow,
10551055
family: commonLabelOptsFont.family || fontFamily,
@@ -1377,7 +1377,7 @@ function createHoverText(hoverData, opts) {
13771377
weight: fontWeight,
13781378
style: fontStyle,
13791379
variant: fontVariant,
1380-
capitalize: fontCapitalize,
1380+
textcase: fontTextcase,
13811381
decorline: fontDecorline,
13821382
shadow: fontShadow,
13831383
family: fontFamily,
@@ -1424,7 +1424,7 @@ function createHoverText(hoverData, opts) {
14241424
weight: d.fontWeight || fontWeight,
14251425
style: d.fontStyle || fontStyle,
14261426
variant: d.fontVariant || fontVariant,
1427-
capitalize: d.fontCapitalize || fontCapitalize,
1427+
textcase: d.fontTextcase || fontTextcase,
14281428
decorline: d.fontDecorline || fontDecorline,
14291429
shadow: d.fontShadow || fontShadow,
14301430
})
@@ -1446,7 +1446,7 @@ function createHoverText(hoverData, opts) {
14461446
weight: d.fontWeight || fontWeight,
14471447
style: d.fontStyle || fontStyle,
14481448
variant: d.fontVariant || fontVariant,
1449-
capitalize: d.fontCapitalize || fontCapitalize,
1449+
textcase: d.fontTextcase || fontTextcase,
14501450
decorline: d.fontDecorline || fontDecorline,
14511451
shadow: d.fontShadow || fontShadow,
14521452
}).text(name)

‎src/components/legend/style.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ module.exports = function style(s, gd, legend) {
247247
dEdit.tw = boundVal('textfont.weight', pickFirst);
248248
dEdit.ty = boundVal('textfont.style', pickFirst);
249249
dEdit.tv = boundVal('textfont.variant', pickFirst);
250-
dEdit.tC = boundVal('textfont.capitalize', pickFirst);
250+
dEdit.tC = boundVal('textfont.textcase', pickFirst);
251251
dEdit.tE = boundVal('textfont.decorline', pickFirst);
252252
dEdit.tS = boundVal('textfont.shadow', pickFirst);
253253
}

‎src/components/titles/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function draw(gd, titleClass, options) {
7171
var fontWeight = font.weight;
7272
var fontStyle = font.style;
7373
var fontVariant = font.variant;
74-
var fontCapitalize = font.capitalize;
74+
var fontTextcase = font.textcase;
7575
var fontDecorline = font.decorline;
7676
var fontShadow = font.shadow;
7777

@@ -155,7 +155,7 @@ function draw(gd, titleClass, options) {
155155
'font-weight': fontWeight,
156156
'font-style': fontStyle,
157157
'font-variant': fontVariant,
158-
'text-transform': Drawing.capitalize2transform(fontCapitalize),
158+
'text-transform': Drawing.textcase2transform(fontTextcase),
159159
'text-shadow': fontShadow === 'auto' ? svgTextUtils.makeTextShadow(Color.contrast(fontColor)) : fontShadow,
160160
'text-decoration-line': Drawing.decorline2decorationLine(fontDecorline),
161161
})

‎src/lib/coerce.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ exports.coerceFont = function(coerce, attr, dfltObj, opts) {
485485

486486
if(!opts.noFontVariant) out.variant = coerce(attr + '.variant', dfltObj.variant);
487487
if(!opts.noFontDecorline) out.decorline = coerce(attr + '.decorline', dfltObj.decorline);
488-
if(!opts.noFontCapitalize) out.capitalize = coerce(attr + '.capitalize', dfltObj.capitalize);
488+
if(!opts.noFontTextcase) out.textcase = coerce(attr + '.textcase', dfltObj.textcase);
489489
if(!opts.noFontShadow) {
490490
var dfltShadow = dfltObj.shadow;
491491
if(dfltShadow === 'none' && opts.autoShadowDflt) {

‎src/plots/cartesian/axes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1740,7 +1740,7 @@ function tickTextObj(ax, x, text) {
17401740
fontWeight: tf.weight,
17411741
fontStyle: tf.style,
17421742
fontVariant: tf.variant,
1743-
fontCapitalize: tf.capitalize,
1743+
fontTextcase: tf.textcase,
17441744
fontDecorline: tf.decorline,
17451745
fontShadow: tf.shadow,
17461746
fontColor: tf.color
@@ -3511,7 +3511,7 @@ axes.drawLabels = function(gd, ax, opts) {
35113511
weight: d.fontWeight,
35123512
style: d.fontStyle,
35133513
variant: d.fontVariant,
3514-
capitalize: d.fontCapitalize,
3514+
textcase: d.fontTextcase,
35153515
decorline: d.fontDecorline,
35163516
shadow: d.fontShadow,
35173517
})

‎src/plots/font_attributes.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ module.exports = function(opts) {
9999
].join(' ')
100100
},
101101

102-
capitalize: opts.noFontCapitalize ? undefined : {
102+
textcase: opts.noFontTextcase ? undefined : {
103103
editType: editType,
104104
valType: 'enumerated',
105105
values: ['normal', 'word', 'upper', 'lower'],
@@ -151,8 +151,8 @@ module.exports = function(opts) {
151151
if(!opts.noFontVariant) {
152152
attrs.variant.arrayOk = true;
153153
}
154-
if(!opts.noFontCapitalize) {
155-
attrs.capitalize.arrayOk = true;
154+
if(!opts.noFontTextcase) {
155+
attrs.textcase.arrayOk = true;
156156
}
157157
if(!opts.noFontDecorline) {
158158
attrs.decorline.arrayOk = true;

‎src/plots/mapbox/layout_attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var fontAttr = fontAttrs({
1414
noFontVariant: true,
1515
noFontShadow: true,
1616
noFontDecorline: true,
17-
noFontCapitalize: true,
17+
noFontTextcase: true,
1818
description: [
1919
'Sets the icon text font (color=mapbox.layer.paint.text-color, size=mapbox.layer.layout.text-size).',
2020
'Has an effect only when `type` is set to *symbol*.'

‎src/plots/mapbox/layout_defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function handleLayerDefaults(layerIn, layerOut) {
107107
noFontVariant: true,
108108
noFontShadow: true,
109109
noFontDecorline: true,
110-
noFontCapitalize: true,
110+
noFontTextcase: true,
111111
});
112112
coerce('symbol.textposition');
113113
coerce('symbol.placement');

‎src/plots/polar/layout_defaults.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
157157
var dfltFontWeight;
158158
var dfltFontStyle;
159159
var dfltFontVariant;
160-
var dfltFontCapitalize;
160+
var dfltFontTextcase;
161161
var dfltFontDecorline;
162162
var dfltFontShadow;
163163
var font = opts.font || {};
@@ -169,7 +169,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
169169
dfltFontWeight = font.weight;
170170
dfltFontStyle = font.style;
171171
dfltFontVariant = font.variant;
172-
dfltFontCapitalize = font.capitalize;
172+
dfltFontTextcase = font.textcase;
173173
dfltFontDecorline = font.decorline;
174174
dfltFontShadow = font.shadow;
175175

@@ -179,7 +179,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
179179
weight: dfltFontWeight,
180180
style: dfltFontStyle,
181181
variant: dfltFontVariant,
182-
capitalize: dfltFontCapitalize,
182+
textcase: dfltFontTextcase,
183183
decorline: dfltFontDecorline,
184184
shadow: dfltFontShadow,
185185
color: dfltFontColor,
@@ -214,7 +214,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
214214
weight: dfltFontWeight,
215215
style: dfltFontStyle,
216216
variant: dfltFontVariant,
217-
capitalize: dfltFontCapitalize,
217+
textcase: dfltFontTextcase,
218218
decorline: dfltFontDecorline,
219219
shadow: dfltFontShadow,
220220
color: dfltFontColor,

‎src/traces/bar/style.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function getInsideTextFont(trace, index, layoutFont, barColor) {
127127
weight: defaultFont.weight,
128128
style: defaultFont.style,
129129
variant: defaultFont.variant,
130-
capitalize: defaultFont.capitalize,
130+
textcase: defaultFont.textcase,
131131
decorline: defaultFont.decorline,
132132
shadow: defaultFont.shadow,
133133
};
@@ -152,7 +152,7 @@ function getFontValue(attributeDefinition, attributeValue, index, defaultValue)
152152
var weightValue = helpers.getValue(attributeValue.weight, index);
153153
var styleValue = helpers.getValue(attributeValue.style, index);
154154
var variantValue = helpers.getValue(attributeValue.variant, index);
155-
var capitalizeValue = helpers.getValue(attributeValue.capitalize, index);
155+
var textcaseValue = helpers.getValue(attributeValue.textcase, index);
156156
var decorlineValue = helpers.getValue(attributeValue.decorline, index);
157157
var shadowValue = helpers.getValue(attributeValue.shadow, index);
158158

@@ -169,8 +169,8 @@ function getFontValue(attributeDefinition, attributeValue, index, defaultValue)
169169
attributeDefinition.style, styleValue, defaultValue.style),
170170
variant: helpers.coerceString(
171171
attributeDefinition.variant, variantValue, defaultValue.variant),
172-
capitalize: helpers.coerceString(
173-
attributeDefinition.variant, capitalizeValue, defaultValue.capitalize),
172+
textcase: helpers.coerceString(
173+
attributeDefinition.variant, textcaseValue, defaultValue.textcase),
174174
decorline: helpers.coerceString(
175175
attributeDefinition.variant, decorlineValue, defaultValue.decorline),
176176
shadow: helpers.coerceString(

‎src/traces/contour/style.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = function style(gd) {
4444
weight: labelFont.weight,
4545
style: labelFont.style,
4646
variant: labelFont.variant,
47-
capitalize: labelFont.capitalize,
47+
textcase: labelFont.textcase,
4848
decorline: labelFont.decorline,
4949
shadow: labelFont.shadow,
5050
family: labelFont.family,

‎src/traces/heatmap/plot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ module.exports = function(gd, plotinfo, cdheatmaps, heatmapLayer) {
551551
weight: font.weight,
552552
style: font.style,
553553
variant: font.variant,
554-
capitalize: font.capitalize,
554+
textcase: font.textcase,
555555
decorline: font.decorline,
556556
shadow: font.shadow,
557557
})

‎src/traces/pie/plot.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -515,10 +515,10 @@ function determineOutsideTextFont(trace, pt, layoutFont) {
515515
helpers.castOption(trace.textfont.variant, pt.pts) ||
516516
layoutFont.variant;
517517

518-
var capitalize =
519-
helpers.castOption(trace.outsidetextfont.capitalize, pt.pts) ||
520-
helpers.castOption(trace.textfont.capitalize, pt.pts) ||
521-
layoutFont.capitalize;
518+
var textcase =
519+
helpers.castOption(trace.outsidetextfont.textcase, pt.pts) ||
520+
helpers.castOption(trace.textfont.textcase, pt.pts) ||
521+
layoutFont.textcase;
522522

523523
var decorline =
524524
helpers.castOption(trace.outsidetextfont.decorline, pt.pts) ||
@@ -537,7 +537,7 @@ function determineOutsideTextFont(trace, pt, layoutFont) {
537537
weight: weight,
538538
style: style,
539539
variant: variant,
540-
capitalize: capitalize,
540+
textcase: textcase,
541541
decorline: decorline,
542542
shadow: shadow,
543543
};
@@ -578,10 +578,10 @@ function determineInsideTextFont(trace, pt, layoutFont) {
578578
helpers.castOption(trace.textfont.variant, pt.pts) ||
579579
layoutFont.variant;
580580

581-
var capitalize =
582-
helpers.castOption(trace.insidetextfont.capitalize, pt.pts) ||
583-
helpers.castOption(trace.textfont.capitalize, pt.pts) ||
584-
layoutFont.capitalize;
581+
var textcase =
582+
helpers.castOption(trace.insidetextfont.textcase, pt.pts) ||
583+
helpers.castOption(trace.textfont.textcase, pt.pts) ||
584+
layoutFont.textcase;
585585

586586
var decorline =
587587
helpers.castOption(trace.insidetextfont.decorline, pt.pts) ||
@@ -600,7 +600,7 @@ function determineInsideTextFont(trace, pt, layoutFont) {
600600
weight: weight,
601601
style: style,
602602
variant: variant,
603-
capitalize: capitalize,
603+
textcase: textcase,
604604
decorline: decorline,
605605
shadow: shadow,
606606
};

‎src/traces/sankey/plot.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ module.exports = function plot(gd, calcData) {
229229
fontWeight: castHoverOption(obj, 'font.weight'),
230230
fontStyle: castHoverOption(obj, 'font.style'),
231231
fontVariant: castHoverOption(obj, 'font.variant'),
232-
fontCapitalize: castHoverOption(obj, 'font.capitalize'),
232+
fontTextcase: castHoverOption(obj, 'font.textcase'),
233233
fontDecorline: castHoverOption(obj, 'font.decorline'),
234234
fontShadow: castHoverOption(obj, 'font.shadow'),
235235
nameLength: castHoverOption(obj, 'namelength'),
@@ -329,7 +329,7 @@ module.exports = function plot(gd, calcData) {
329329
fontWeight: castHoverOption(obj, 'font.weight'),
330330
fontStyle: castHoverOption(obj, 'font.style'),
331331
fontVariant: castHoverOption(obj, 'font.variant'),
332-
fontCapitalize: castHoverOption(obj, 'font.capitalize'),
332+
fontTextcase: castHoverOption(obj, 'font.textcase'),
333333
fontDecorline: castHoverOption(obj, 'font.decorline'),
334334
fontShadow: castHoverOption(obj, 'font.shadow'),
335335
nameLength: castHoverOption(obj, 'namelength'),

‎src/traces/scatter/arrays_to_calcdata.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = function arraysToCalcdata(cd, trace) {
2020
Lib.mergeArray(trace.textfont.weight, cd, 'tw');
2121
Lib.mergeArray(trace.textfont.style, cd, 'ty');
2222
Lib.mergeArray(trace.textfont.variant, cd, 'tv');
23-
Lib.mergeArray(trace.textfont.capitalize, cd, 'tC');
23+
Lib.mergeArray(trace.textfont.textcase, cd, 'tC');
2424
Lib.mergeArray(trace.textfont.decorline, cd, 'tE');
2525
Lib.mergeArray(trace.textfont.shadow, cd, 'tS');
2626
}

‎src/traces/scatter3d/attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ var attrs = module.exports = overrideAll({
159159
textfont: fontAttrs({
160160
noFontShadow: true,
161161
noFontDecorline: true,
162-
noFontCapitalize: true,
162+
noFontTextcase: true,
163163
editType: 'calc',
164164
colorEditType: 'style',
165165
arrayOk: true,

‎src/traces/scatter3d/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
4545
noSelect: true,
4646
noFontShadow: true,
4747
noFontDecorline: true,
48-
noFontCapitalize: true,
48+
noFontTextcase: true,
4949
});
5050
}
5151

‎src/traces/scattergl/attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var attrs = module.exports = overrideAll({
4040
textfont: fontAttrs({
4141
noFontShadow: true,
4242
noFontDecorline: true,
43-
noFontCapitalize: true,
43+
noFontTextcase: true,
4444
editType: 'calc',
4545
colorEditType: 'style',
4646
arrayOk: true,

‎src/traces/scattergl/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
5555
handleTextDefaults(traceIn, traceOut, layout, coerce, {
5656
noFontShadow: true,
5757
noFontDecorline: true,
58-
noFontCapitalize: true,
58+
noFontTextcase: true,
5959
});
6060
}
6161

‎src/traces/scattermapbox/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
7575
noFontVariant: true,
7676
noFontShadow: true,
7777
noFontDecorline: true,
78-
noFontCapitalize: true,
78+
noFontTextcase: true,
7979
font: {
8080
family: isSupportedFont(layoutFontFamily) ? layoutFontFamily : 'Open Sans Regular',
8181
weight: layout.font.weight,

0 commit comments

Comments
 (0)