Skip to content

Commit 581b2fc

Browse files
archmojarchmoj
committed
striding > decorline
1 parent b0977dd commit 581b2fc

Some content is hidden

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

55 files changed

+5271
-5183
lines changed

‎src/components/drawing/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ drawing.font = function(s, font) {
3535
var size = font.size;
3636
var family = font.family;
3737
var shadow = font.shadow;
38-
var striding = font.striding;
38+
var decorline = font.decorline;
3939
var capitalize = font.capitalize;
4040

4141
if(family) s.style('font-family', family);
@@ -48,7 +48,7 @@ drawing.font = function(s, font) {
4848

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

5454
var capitalize2transformOptions = {
@@ -63,17 +63,17 @@ function capitalize2transform(capitalize) {
6363
}
6464
drawing.capitalize2transform = capitalize2transform;
6565

66-
function striding2decorationLine(striding) {
66+
function decorline2decorationLine(decorline) {
6767
return (
68-
striding
68+
decorline
6969
.replace('under', 'underline')
7070
.replace('over', 'overline')
7171
.replace('through', 'line-through')
7272
.split('+')
7373
.join(' ')
7474
);
7575
}
76-
drawing.striding2decorationLine = striding2decorationLine;
76+
drawing.decorline2decorationLine = decorline2decorationLine;
7777

7878
/*
7979
* Positioning helpers
@@ -1168,7 +1168,7 @@ drawing.textPointStyle = function(s, trace, gd) {
11681168
style: d.ty || trace.textfont.style,
11691169
variant: d.tv || trace.textfont.variant,
11701170
capitalize: d.tC || trace.textfont.capitalize,
1171-
striding: d.tE || trace.textfont.striding,
1171+
decorline: d.tE || trace.textfont.decorline,
11721172
shadow: d.tS || trace.textfont.shadow,
11731173
size: fontSize,
11741174
color: fontColor

‎src/components/fx/hover.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ function createHoverText(hoverData, opts) {
962962
var fontStyle = opts.fontStyle || fullLayout.font.style;
963963
var fontVariant = opts.fontVariant || fullLayout.font.variant;
964964
var fontCapitalize = opts.fontCapitalize || fullLayout.font.capitalize;
965-
var fontStriding = opts.fontStriding || fullLayout.font.striding;
965+
var fontDecorline = opts.fontDecorline || fullLayout.font.decorline;
966966
var fontShadow = opts.fontShadow || fullLayout.font.shadow;
967967

968968
var c0 = hoverData[0];
@@ -1050,7 +1050,7 @@ function createHoverText(hoverData, opts) {
10501050
style: commonLabelOptsFont.style || fontStyle,
10511051
variant: commonLabelOptsFont.variant || fontVariant,
10521052
capitalize: commonLabelOptsFont.capitalize || fontCapitalize,
1053-
striding: commonLabelOptsFont.striding || fontStriding,
1053+
decorline: commonLabelOptsFont.decorline || fontDecorline,
10541054
shadow: commonLabelOptsFont.shadow || fontShadow,
10551055
family: commonLabelOptsFont.family || fontFamily,
10561056
size: commonLabelOptsFont.size || fontSize,
@@ -1378,7 +1378,7 @@ function createHoverText(hoverData, opts) {
13781378
style: fontStyle,
13791379
variant: fontVariant,
13801380
capitalize: fontCapitalize,
1381-
striding: fontStriding,
1381+
decorline: fontDecorline,
13821382
shadow: fontShadow,
13831383
family: fontFamily,
13841384
size: fontSize
@@ -1425,7 +1425,7 @@ function createHoverText(hoverData, opts) {
14251425
style: d.fontStyle || fontStyle,
14261426
variant: d.fontVariant || fontVariant,
14271427
capitalize: d.fontCapitalize || fontCapitalize,
1428-
striding: d.fontStriding || fontStriding,
1428+
decorline: d.fontDecorline || fontDecorline,
14291429
shadow: d.fontShadow || fontShadow,
14301430
})
14311431
.text(text)
@@ -1447,7 +1447,7 @@ function createHoverText(hoverData, opts) {
14471447
style: d.fontStyle || fontStyle,
14481448
variant: d.fontVariant || fontVariant,
14491449
capitalize: d.fontCapitalize || fontCapitalize,
1450-
striding: d.fontStriding || fontStriding,
1450+
decorline: d.fontDecorline || fontDecorline,
14511451
shadow: d.fontShadow || fontShadow,
14521452
}).text(name)
14531453
.attr('data-notex', 1)

‎src/components/legend/style.js

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

‎src/components/titles/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function draw(gd, titleClass, options) {
7272
var fontStyle = font.style;
7373
var fontVariant = font.variant;
7474
var fontCapitalize = font.capitalize;
75-
var fontStriding = font.striding;
75+
var fontDecorline = font.decorline;
7676
var fontShadow = font.shadow;
7777

7878
// only make this title editable if we positively identify its property
@@ -157,7 +157,7 @@ function draw(gd, titleClass, options) {
157157
'font-variant': fontVariant,
158158
'text-transform': Drawing.capitalize2transform(fontCapitalize),
159159
'text-shadow': fontShadow === 'auto' ? svgTextUtils.makeTextShadow(Color.contrast(fontColor)) : fontShadow,
160-
'text-decoration-line': Drawing.striding2decorationLine(fontStriding),
160+
'text-decoration-line': Drawing.decorline2decorationLine(fontDecorline),
161161
})
162162
.attr(attributes)
163163
.call(svgTextUtils.convertToTspans, gd);

‎src/lib/coerce.js

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

473473
if(!opts.noFontVariant) out.variant = coerce(attr + '.variant', dfltObj.variant);
474-
if(!opts.noFontStriding) out.striding = coerce(attr + '.striding', dfltObj.striding);
474+
if(!opts.noFontStriding) out.decorline = coerce(attr + '.decorline', dfltObj.decorline);
475475
if(!opts.noFontCapitalize) out.capitalize = coerce(attr + '.capitalize', dfltObj.capitalize);
476476
if(!opts.noFontShadow) {
477477
var dfltShadow = dfltObj.shadow;

‎src/plots/cartesian/axes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1741,7 +1741,7 @@ function tickTextObj(ax, x, text) {
17411741
fontStyle: tf.style,
17421742
fontVariant: tf.variant,
17431743
fontCapitalize: tf.capitalize,
1744-
fontStriding: tf.striding,
1744+
fontStriding: tf.decorline,
17451745
fontShadow: tf.shadow,
17461746
fontColor: tf.color
17471747
};
@@ -3512,7 +3512,7 @@ axes.drawLabels = function(gd, ax, opts) {
35123512
style: d.fontStyle,
35133513
variant: d.fontVariant,
35143514
capitalize: d.fontCapitalize,
3515-
striding: d.fontStriding,
3515+
decorline: d.fontStriding,
35163516
shadow: d.fontShadow,
35173517
})
35183518
.text(d.text)

‎src/plots/font_attributes.js

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

101-
striding: opts.noFontStriding ? undefined : {
101+
decorline: opts.noFontDecorline ? undefined : {
102102
editType: editType,
103103
valType: 'flaglist',
104104
flags: ['under', 'over', 'through'],
@@ -141,8 +141,8 @@ module.exports = function(opts) {
141141
if(!opts.noFontCapitalize) {
142142
attrs.capitalize.arrayOk = true;
143143
}
144-
if(!opts.noFontStriding) {
145-
attrs.striding.arrayOk = true;
144+
if(!opts.noFontDecorline) {
145+
attrs.decorline.arrayOk = true;
146146
}
147147
if(!opts.noFontShadow) {
148148
attrs.shadow.arrayOk = true;

‎src/plots/polar/layout_defaults.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
170170
dfltFontStyle = font.style;
171171
dfltFontVariant = font.variant;
172172
dfltFontCapitalize = font.capitalize;
173-
dfltFontStriding = font.striding;
173+
dfltFontStriding = font.decorline;
174174
dfltFontShadow = font.shadow;
175175

176176
handleTickValueDefaults(axIn, axOut, coerceAxis, axOut.type);
@@ -180,7 +180,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
180180
style: dfltFontStyle,
181181
variant: dfltFontVariant,
182182
capitalize: dfltFontCapitalize,
183-
striding: dfltFontStriding,
183+
decorline: dfltFontStriding,
184184
shadow: dfltFontShadow,
185185
color: dfltFontColor,
186186
size: dfltFontSize,
@@ -215,7 +215,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
215215
style: dfltFontStyle,
216216
variant: dfltFontVariant,
217217
capitalize: dfltFontCapitalize,
218-
striding: dfltFontStriding,
218+
decorline: dfltFontStriding,
219219
shadow: dfltFontShadow,
220220
color: dfltFontColor,
221221
size: Lib.bigFont(dfltFontSize),

‎src/traces/bar/style.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ function getInsideTextFont(trace, index, layoutFont, barColor) {
128128
style: defaultFont.style,
129129
variant: defaultFont.variant,
130130
capitalize: defaultFont.capitalize,
131-
striding: defaultFont.striding,
131+
decorline: defaultFont.decorline,
132132
shadow: defaultFont.shadow,
133133
};
134134
}
@@ -153,7 +153,7 @@ function getFontValue(attributeDefinition, attributeValue, index, defaultValue)
153153
var styleValue = helpers.getValue(attributeValue.style, index);
154154
var variantValue = helpers.getValue(attributeValue.variant, index);
155155
var capitalizeValue = helpers.getValue(attributeValue.capitalize, index);
156-
var stridingValue = helpers.getValue(attributeValue.striding, index);
156+
var decorlineValue = helpers.getValue(attributeValue.decorline, index);
157157
var shadowValue = helpers.getValue(attributeValue.shadow, index);
158158

159159
return {
@@ -171,8 +171,8 @@ function getFontValue(attributeDefinition, attributeValue, index, defaultValue)
171171
attributeDefinition.variant, variantValue, defaultValue.variant),
172172
capitalize: helpers.coerceString(
173173
attributeDefinition.variant, capitalizeValue, defaultValue.capitalize),
174-
striding: helpers.coerceString(
175-
attributeDefinition.variant, stridingValue, defaultValue.striding),
174+
decorline: helpers.coerceString(
175+
attributeDefinition.variant, decorlineValue, defaultValue.decorline),
176176
shadow: helpers.coerceString(
177177
attributeDefinition.variant, shadowValue, defaultValue.shadow),
178178
};

‎src/traces/contour/style.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module.exports = function style(gd) {
4545
style: labelFont.style,
4646
variant: labelFont.variant,
4747
capitalize: labelFont.capitalize,
48-
striding: labelFont.striding,
48+
decorline: labelFont.decorline,
4949
shadow: labelFont.shadow,
5050
family: labelFont.family,
5151
size: labelFont.size,

‎src/traces/heatmap/plot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ module.exports = function(gd, plotinfo, cdheatmaps, heatmapLayer) {
552552
style: font.style,
553553
variant: font.variant,
554554
capitalize: font.capitalize,
555-
striding: font.striding,
555+
decorline: font.decorline,
556556
shadow: font.shadow,
557557
})
558558
.text(d.t)

‎src/traces/pie/plot.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -520,10 +520,10 @@ function determineOutsideTextFont(trace, pt, layoutFont) {
520520
helpers.castOption(trace.textfont.capitalize, pt.pts) ||
521521
layoutFont.capitalize;
522522

523-
var striding =
524-
helpers.castOption(trace.outsidetextfont.striding, pt.pts) ||
525-
helpers.castOption(trace.textfont.striding, pt.pts) ||
526-
layoutFont.striding;
523+
var decorline =
524+
helpers.castOption(trace.outsidetextfont.decorline, pt.pts) ||
525+
helpers.castOption(trace.textfont.decorline, pt.pts) ||
526+
layoutFont.decorline;
527527

528528
var shadow =
529529
helpers.castOption(trace.outsidetextfont.shadow, pt.pts) ||
@@ -538,7 +538,7 @@ function determineOutsideTextFont(trace, pt, layoutFont) {
538538
style: style,
539539
variant: variant,
540540
capitalize: capitalize,
541-
striding: striding,
541+
decorline: decorline,
542542
shadow: shadow,
543543
};
544544
}
@@ -583,10 +583,10 @@ function determineInsideTextFont(trace, pt, layoutFont) {
583583
helpers.castOption(trace.textfont.capitalize, pt.pts) ||
584584
layoutFont.capitalize;
585585

586-
var striding =
587-
helpers.castOption(trace.insidetextfont.striding, pt.pts) ||
588-
helpers.castOption(trace.textfont.striding, pt.pts) ||
589-
layoutFont.striding;
586+
var decorline =
587+
helpers.castOption(trace.insidetextfont.decorline, pt.pts) ||
588+
helpers.castOption(trace.textfont.decorline, pt.pts) ||
589+
layoutFont.decorline;
590590

591591
var shadow =
592592
helpers.castOption(trace.insidetextfont.shadow, pt.pts) ||
@@ -601,7 +601,7 @@ function determineInsideTextFont(trace, pt, layoutFont) {
601601
style: style,
602602
variant: variant,
603603
capitalize: capitalize,
604-
striding: striding,
604+
decorline: decorline,
605605
shadow: shadow,
606606
};
607607
}

‎src/traces/sankey/plot.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ module.exports = function plot(gd, calcData) {
230230
fontStyle: castHoverOption(obj, 'font.style'),
231231
fontVariant: castHoverOption(obj, 'font.variant'),
232232
fontCapitalize: castHoverOption(obj, 'font.capitalize'),
233-
fontStriding: castHoverOption(obj, 'font.striding'),
233+
fontStriding: castHoverOption(obj, 'font.decorline'),
234234
fontShadow: castHoverOption(obj, 'font.shadow'),
235235
nameLength: castHoverOption(obj, 'namelength'),
236236
textAlign: castHoverOption(obj, 'align'),
@@ -330,7 +330,7 @@ module.exports = function plot(gd, calcData) {
330330
fontStyle: castHoverOption(obj, 'font.style'),
331331
fontVariant: castHoverOption(obj, 'font.variant'),
332332
fontCapitalize: castHoverOption(obj, 'font.capitalize'),
333-
fontStriding: castHoverOption(obj, 'font.striding'),
333+
fontStriding: castHoverOption(obj, 'font.decorline'),
334334
fontShadow: castHoverOption(obj, 'font.shadow'),
335335
nameLength: castHoverOption(obj, 'namelength'),
336336
textAlign: castHoverOption(obj, 'align'),

‎src/traces/scatter/arrays_to_calcdata.js

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

‎src/traces/sunburst/helpers.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function determineOutsideTextFont(trace, pt, layoutFont) {
7676
style: exports.getOutsideTextFontKey('style', trace, pt, layoutFont),
7777
variant: exports.getOutsideTextFontKey('variant', trace, pt, layoutFont),
7878
capitalize: exports.getOutsideTextFontKey('capitalize', trace, pt, layoutFont),
79-
striding: exports.getOutsideTextFontKey('striding', trace, pt, layoutFont),
79+
decorline: exports.getOutsideTextFontKey('decorline', trace, pt, layoutFont),
8080
shadow: exports.getOutsideTextFontKey('shadow', trace, pt, layoutFont),
8181
};
8282
}
@@ -107,7 +107,7 @@ function determineInsideTextFont(trace, pt, layoutFont, opts) {
107107
style: exports.getInsideTextFontKey('style', trace, pt, layoutFont, opts),
108108
variant: exports.getInsideTextFontKey('variant', trace, pt, layoutFont, opts),
109109
capitalize: exports.getInsideTextFontKey('capitalize', trace, pt, layoutFont, opts),
110-
striding: exports.getInsideTextFontKey('striding', trace, pt, layoutFont, opts),
110+
decorline: exports.getInsideTextFontKey('decorline', trace, pt, layoutFont, opts),
111111
shadow: exports.getInsideTextFontKey('shadow', trace, pt, layoutFont, opts),
112112
};
113113
}

‎src/traces/table/plot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ function supplyStylingValues(columnCell) {
489489
style: gridPick(spec.style, col, i),
490490
variant: gridPick(spec.variant, col, i),
491491
capitalize: gridPick(spec.capitalize, col, i),
492-
striding: gridPick(spec.striding, col, i),
492+
decorline: gridPick(spec.decorline, col, i),
493493
shadow: gridPick(spec.shadow, col, i),
494494
};
495495
d.rowNumber = d.key;

‎test/image/mocks/axes_custom-ticks_log-date.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"layout": {
1616
"font": {
1717
"capitalize": "word",
18-
"striding": "under",
18+
"decorline": "under",
1919
"shadow": "auto"
2020
},
2121
"width": 500,

‎test/image/mocks/axes_labels.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"layout": {
5555
"font": {
5656
"capitalize": "word",
57-
"striding": "under",
57+
"decorline": "under",
5858
"shadow": "auto"
5959
},
6060
"xaxis": {

‎test/image/mocks/bar-colorscale-colorbar.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"layout": {
5757
"font": {
5858
"capitalize": "word",
59-
"striding": "under",
59+
"decorline": "under",
6060
"shadow": "auto"
6161
},
6262
"title": {

‎test/image/mocks/bar_annotation_max_range_eq_category.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"style": "italic",
1313
"variant": "small-caps",
1414
"capitalize": "word",
15-
"striding": "under",
15+
"decorline": "under",
1616
"shadow": "auto"
1717
},
1818
"xaxis": {

‎test/image/mocks/bar_attrs_group_norm.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"layout":{
1818
"font": {
1919
"capitalize": "word",
20-
"striding": "under",
20+
"decorline": "under",
2121
"shadow": "auto"
2222
},
2323
"height":400,

‎test/image/mocks/bar_gantt-chart.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"layout": {
7171
"font": {
7272
"capitalize": "word",
73-
"striding": "under",
73+
"decorline": "under",
7474
"shadow": "auto"
7575
},
7676
"barcornerradius": "50%",

0 commit comments

Comments
 (0)