8000 Fix setting tickwidth, tickcolor, ticklen, linecolor and possibly more attributes via template by archmoj · Pull Request #4904 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Fix setting tickwidth, tickcolor, ticklen, linecolor and possibly more attributes via template #4904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jun 17, 2020
Merged

Fix setting tickwidth, tickcolor, ticklen, linecolor and possibly more attributes via template #4904

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bddaafa
allow template input in Lib.coerce2 - fix issue 4852
archmoj Jun 5, 2020
11fd23c
update axes_breaks-round-weekdaysm baseline
archmoj Jun 5, 2020
756a0ee
refactor coerce rename v to valIn
archmoj Jun 7, 2020
a2c1c93
refactor coerce rename out to valOut
archmoj Jun 7, 2020
8d0b4cb
exit early
archmoj Jun 7, 2020
5c3be81
rename propOut to valOut
archmoj Jun 7, 2020
642bf28
add internal _coerce function
archmoj Jun 7, 2020
57cec14
reduce condition checks
archmoj Jun 8, 2020
1d9cc4a
keep track of source and input in _coerce function
archmoj Jun 9, 2020
cf7c061
fixup Lib.coerce2 description and color test
archmoj Jun 10, 2020
21b86cd
add jasmine tests to cover invalid inputs in Lib.coerce2
archmoj Jun 10, 2020
2b911d1
make room for opts - rename opts to attr
archmoj Jun 16, 2020
adc36cd
validate input when calling from coerce2
archmoj Jun 16, 2020
24d1da9
remove unnecessary validation, also
archmoj Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor coerce rename v to valIn
  • Loading branch information
@archmoj
archmoj committed Jun 7, 2020
commit 756a0ee4441df7eb4ad8c347c17f2018a86e086e
20 changes: 10 additions & 10 deletions src/lib/coerce.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,11 +364,11 @@ exports.coerce = function(containerIn, containerOut, attributes, attribute, dflt
var opts = nestedProperty(attributes, attribute).get();
var propIn = nestedProperty(containerIn, attribute);
var propOut = nestedProperty(containerOut, attribute);
var v = propIn.get();
var valIn = propIn.get();

var template = containerOut._template;
if(v === undefined && template) {
v = nestedProperty(template, attribute).get();
if(valIn === undefined && template) {
valIn = nestedProperty(template, attribute).get();
// already used the template value, so short-circuit the second check
template = 0;
}
Expand All @@ -381,20 +381,20 @@ exports.coerce = function(containerIn, containerOut, attributes, attribute, dflt
* individual form (eg. some array vals can be numbers, even if the
* single values must be color strings)
*/
if(opts.arrayOk && isArrayOrTypedArray(v)) {
propOut.set(v);
return v;
if(opts.arrayOk && isArrayOrTypedArray(valIn)) {
propOut.set(valIn);
return valIn;
}

var coerceFunction = exports.valObjectMeta[opts.valType].coerceFunction;
coerceFunction(v, propOut, dflt, opts);
coerceFunction(valIn, propOut, dflt, opts);

var out = propOut.get();
// in case v was provided but invalid, try the template again so it still
// overrides the regular default
if(template && out === dflt && !validate(v, opts)) {
v = nestedProperty(template, attribute).get();
coerceFunction(v, propOut, dflt, opts);
if(template && out === dflt && !validate(valIn, opts)) {
valIn = nestedProperty(template, attribute).get();
coerceFunction(valIn, propOut, dflt, opts);
out = propOut.get();
}
return out;
Expand Down
0