Skip to content

Commit a344464

Browse files
archmojarchmoj
committed
decorline > lineposition
1 parent 3ff255f commit a344464

File tree

66 files changed

+4027
-4027
lines changed

Some content is hidden

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

66 files changed

+4027
-4027
lines changed

‎src/components/annotations/draw.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ function drawRaw(gd, options, index, subplotId, xa, ya) {
200200
fontStyle: hoverFont.style,
201201
fontVariant: hoverFont.variant,
202202
fontShadow: hoverFont.fontShadow,
203-
fontDecorline: hoverFont.fontDecorline,
203+
fontLineposition: hoverFont.fontLineposition,
204204
fontTextcase: hoverFont.fontTextcase,
205205
}, {
206206
container: fullLayout._hoverlayer.node(),

‎src/components/drawing/index.js

Lines changed: 5 additions & 5 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 decorline = font.decorline;
38+
var lineposition = font.lineposition;
3939
var textcase = font.textcase;
4040

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

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

5454
var textcase2transformOptions = {
@@ -62,9 +62,9 @@ function textcase2transform(textcase) {
6262
return textcase2transformOptions[textcase];
6363
}
6464

65-
function decorline2decorationLine(decorline) {
65+
function lineposition2decorationLine(lineposition) {
6666
return (
67-
decorline
67+
lineposition
6868
.replace('under', 'underline')
6969
.replace('over', 'overline')
7070
.replace('through', 'line-through')
@@ -1166,7 +1166,7 @@ drawing.textPointStyle = function(s, trace, gd) {
11661166
style: d.ty || trace.textfont.style,
11671167
variant: d.tv || trace.textfont.variant,
11681168
textcase: d.tC || trace.textfont.textcase,
1169-
decorline: d.tE || trace.textfont.decorline,
1169+
lineposition: d.tE || trace.textfont.lineposition,
11701170
shadow: d.tS || trace.textfont.shadow,
11711171
size: fontSize,
11721172
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 fontTextcase = opts.fontTextcase || fullLayout.font.textcase;
965-
var fontDecorline = opts.fontDecorline || fullLayout.font.decorline;
965+
var fontLineposition = opts.fontLineposition || fullLayout.font.lineposition;
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
textcase: commonLabelOptsFont.textcase || fontTextcase,
1053-
decorline: commonLabelOptsFont.decorline || fontDecorline,
1053+
lineposition: commonLabelOptsFont.lineposition || fontLineposition,
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
textcase: fontTextcase,
1381-
decorline: fontDecorline,
1381+
lineposition: fontLineposition,
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
textcase: d.fontTextcase || fontTextcase,
1428-
decorline: d.fontDecorline || fontDecorline,
1428+
lineposition: d.fontLineposition || fontLineposition,
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
textcase: d.fontTextcase || fontTextcase,
1450-
decorline: d.fontDecorline || fontDecorline,
1450+
lineposition: d.fontLineposition || fontLineposition,
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.textcase', pickFirst);
251-
dEdit.tE = boundVal('textfont.decorline', pickFirst);
251+
dEdit.tE = boundVal('textfont.lineposition', 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 fontTextcase = font.textcase;
75-
var fontDecorline = font.decorline;
75+
var fontLineposition = font.lineposition;
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
variant: fontVariant,
158158
textcase: fontTextcase,
159159
shadow: fontShadow,
160-
decorline: fontDecorline,
160+
lineposition: fontLineposition,
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
@@ -484,7 +484,7 @@ exports.coerceFont = function(coerce, attr, dfltObj, opts) {
484484
};
485485

486486
if(!opts.noFontVariant) out.variant = coerce(attr + '.variant', dfltObj.variant);
487-
if(!opts.noFontDecorline) out.decorline = coerce(attr + '.decorline', dfltObj.decorline);
487+
if(!opts.noFontLineposition) out.lineposition = coerce(attr + '.lineposition', dfltObj.lineposition);
488488
if(!opts.noFontTextcase) out.textcase = coerce(attr + '.textcase', dfltObj.textcase);
489489
if(!opts.noFontShadow) {
490490
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
fontTextcase: tf.textcase,
1744-
fontDecorline: tf.decorline,
1744+
fontLineposition: tf.lineposition,
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
textcase: d.fontTextcase,
3515-
decorline: d.fontDecorline,
3515+
lineposition: d.fontLineposition,
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
@@ -111,7 +111,7 @@ module.exports = function(opts) {
111111
].join(' ')
112112
},
113113

114-
decorline: opts.noFontDecorline ? undefined : {
114+
lineposition: opts.noFontLineposition ? undefined : {
115115
editType: editType,
116116
valType: 'flaglist',
117117
flags: ['under', 'over', 'through'],
@@ -154,8 +154,8 @@ module.exports = function(opts) {
154154
if(!opts.noFontTextcase) {
155155
attrs.textcase.arrayOk = true;
156156
}
157-
if(!opts.noFontDecorline) {
158-
attrs.decorline.arrayOk = true;
157+
if(!opts.noFontLineposition) {
158+
attrs.lineposition.arrayOk = true;
159159
}
160160
if(!opts.noFontShadow) {
161161
attrs.shadow.arrayOk = true;

‎src/plots/mapbox/layout_attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var constants = require('./constants');
1313
var fontAttr = fontAttrs({
1414
noFontVariant: true,
1515
noFontShadow: true,
16-
noFontDecorline: true,
16+
noFontLineposition: true,
1717
noFontTextcase: true,
1818
description: [
1919
'Sets the icon text font (color=mapbox.layer.paint.text-color, size=mapbox.layer.layout.text-size).',

‎src/plots/mapbox/layout_defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ function handleLayerDefaults(layerIn, layerOut) {
106106
Lib.coerceFont(coerce, 'symbol.textfont', undefined, {
107107
noFontVariant: true,
108108
noFontShadow: true,
109-
noFontDecorline: true,
109+
noFontLineposition: true,
110110
noFontTextcase: true,
111111
});
112112
coerce('symbol.textposition');

‎src/plots/polar/layout_defaults.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
158158
var dfltFontStyle;
159159
var dfltFontVariant;
160160
var dfltFontTextcase;
161-
var dfltFontDecorline;
161+
var dfltFontLineposition;
162162
var dfltFontShadow;
163163
var font = opts.font || {};
164164

@@ -170,7 +170,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
170170
dfltFontStyle = font.style;
171171
dfltFontVariant = font.variant;
172172
dfltFontTextcase = font.textcase;
173-
dfltFontDecorline = font.decorline;
173+
dfltFontLineposition = font.lineposition;
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
textcase: dfltFontTextcase,
183-
decorline: dfltFontDecorline,
183+
lineposition: dfltFontLineposition,
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
textcase: dfltFontTextcase,
218-
decorline: dfltFontDecorline,
218+
lineposition: dfltFontLineposition,
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
textcase: defaultFont.textcase,
131-
decorline: defaultFont.decorline,
131+
lineposition: defaultFont.lineposition,
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 textcaseValue = helpers.getValue(attributeValue.textcase, index);
156-
var decorlineValue = helpers.getValue(attributeValue.decorline, index);
156+
var linepositionValue = helpers.getValue(attributeValue.lineposition, 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
textcase: helpers.coerceString(
173173
attributeDefinition.variant, textcaseValue, defaultValue.textcase),
174-
decorline: helpers.coerceString(
175-
attributeDefinition.variant, decorlineValue, defaultValue.decorline),
174+
lineposition: helpers.coerceString(
175+
attributeDefinition.variant, linepositionValue, defaultValue.lineposition),
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
textcase: labelFont.textcase,
48-
decorline: labelFont.decorline,
48+
lineposition: labelFont.lineposition,
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
textcase: font.textcase,
555-
decorline: font.decorline,
555+
lineposition: font.lineposition,
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.textcase, pt.pts) ||
521521
layoutFont.textcase;
522522

523-
var decorline =
524-
helpers.castOption(trace.outsidetextfont.decorline, pt.pts) ||
525-
helpers.castOption(trace.textfont.decorline, pt.pts) ||
526-
layoutFont.decorline;
523+
var lineposition =
524+
helpers.castOption(trace.outsidetextfont.lineposition, pt.pts) ||
525+
helpers.castOption(trace.textfont.lineposition, pt.pts) ||
526+
layoutFont.lineposition;
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
textcase: textcase,
541-
decorline: decorline,
541+
lineposition: lineposition,
542542
shadow: shadow,
543543
};
544544
}
@@ -583,10 +583,10 @@ function determineInsideTextFont(trace, pt, layoutFont) {
583583
helpers.castOption(trace.textfont.textcase, pt.pts) ||
584584
layoutFont.textcase;
585585

586-
var decorline =
587-
helpers.castOption(trace.insidetextfont.decorline, pt.pts) ||
588-
helpers.castOption(trace.textfont.decorline, pt.pts) ||
589-
layoutFont.decorline;
586+
var lineposition =
587+
helpers.castOption(trace.insidetextfont.lineposition, pt.pts) ||
588+
helpers.castOption(trace.textfont.lineposition, pt.pts) ||
589+
layoutFont.lineposition;
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
textcase: textcase,
604-
decorline: decorline,
604+
lineposition: lineposition,
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
fontTextcase: castHoverOption(obj, 'font.textcase'),
233-
fontDecorline: castHoverOption(obj, 'font.decorline'),
233+
fontLineposition: castHoverOption(obj, 'font.lineposition'),
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
fontTextcase: castHoverOption(obj, 'font.textcase'),
333-
fontDecorline: castHoverOption(obj, 'font.decorline'),
333+
fontLineposition: castHoverOption(obj, 'font.lineposition'),
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.textcase, cd, 'tC');
24-
Lib.mergeArray(trace.textfont.decorline, cd, 'tE');
24+
Lib.mergeArray(trace.textfont.lineposition, cd, 'tE');
2525
Lib.mergeArray(trace.textfont.shadow, cd, 'tS');
2626
}
2727

‎src/traces/scatter3d/attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ var attrs = module.exports = overrideAll({
158158
textposition: extendFlat({}, scatterAttrs.textposition, {dflt: 'top center'}),
159159
textfont: fontAttrs({
160160
noFontShadow: true,
161-
noFontDecorline: true,
161+
noFontLineposition: true,
162162
noFontTextcase: true,
163163
editType: 'calc',
164164
colorEditType: 'style',

‎src/traces/scatter3d/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
4444
handleTextDefaults(traceIn, traceOut, layout, coerce, {
4545
noSelect: true,
4646
noFontShadow: true,
47-
noFontDecorline: true,
47+
noFontLineposition: true,
4848
noFontTextcase: true,
4949
});
5050
}

‎src/traces/scattergl/attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var attrs = module.exports = overrideAll({
3939
textposition: scatterAttrs.textposition,
4040
textfont: fontAttrs({
4141
noFontShadow: true,
42-
noFontDecorline: true,
42+
noFontLineposition: true,
4343
noFontTextcase: true,
4444
editType: 'calc',
4545
colorEditType: 'style',

‎src/traces/scattergl/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
5454
coerce('texttemplate');
5555
handleTextDefaults(traceIn, traceOut, layout, coerce, {
5656
noFontShadow: true,
57-
noFontDecorline: true,
57+
noFontLineposition: true,
5858
noFontTextcase: true,
5959
});
6060
}

‎src/traces/scattermapbox/defaults.js

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

‎src/traces/scatterpolargl/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
4242
coerce('texttemplate');
4343
handleTextDefaults(traceIn, traceOut, layout, coerce, {
4444
noFontShadow: true,
45-
noFontDecorline: true,
45+
noFontLineposition: true,
4646
noFontTextcase: true,
4747
});
4848
}

0 commit comments

Comments
 (0)