[refactor] improve update

This commit is contained in:
zombieFox 2020-06-17 22:01:22 +01:00
parent 99dbba64dd
commit b972e2cc83

View File

@ -982,20 +982,12 @@ var update = (function() {
arrayItem.accent.color[key] = 0; arrayItem.accent.color[key] = 0;
}; };
}; };
if (arrayItem.accent.color) { arrayItem.accent.rgb = {
arrayItem.accent.rgb = { r: arrayItem.accent.color.r,
r: arrayItem.accent.color.r, g: arrayItem.accent.color.g,
g: arrayItem.accent.color.g, b: arrayItem.accent.color.b
b: arrayItem.accent.color.b
};
delete arrayItem.accent.color;
} else if (!arrayItem.accent.rgb) {
arrayItem.accent.rgb = {
r: 0,
g: 0,
b: 0
};
}; };
delete arrayItem.accent.color;
arrayItem.accent.hsl = { arrayItem.accent.hsl = {
h: 0, h: 0,
s: 0, s: 0,
@ -1021,35 +1013,26 @@ var update = (function() {
} }
}; };
arrayItem.image = ""; arrayItem.image = "";
if (!arrayItem.visual) { arrayItem.visual = {
arrayItem.visual = { display: arrayItem.display,
display: arrayItem.display, letter: arrayItem.letter,
letter: arrayItem.letter, image: "",
image: "", icon: arrayItem.icon
icon: arrayItem.icon
};
delete arrayItem.display;
delete arrayItem.letter;
delete arrayItem.icon;
if (arrayItem.visual.letter == null) {
arrayItem.visual.letter = "";
};
}; };
if (arrayItem.visual) { delete arrayItem.display;
if (arrayItem.visual.icon) { delete arrayItem.letter;
if (arrayItem.visual.icon.label == null) { delete arrayItem.icon;
arrayItem.visual.icon.label = ""; if (arrayItem.visual.letter == null) {
}; arrayItem.visual.letter = "";
if (arrayItem.visual.icon.name == null) {
arrayItem.visual.icon.name = "";
};
if (arrayItem.visual.icon.prefix == null) {
arrayItem.visual.icon.prefix = "";
};
};
}; };
if (arrayItem.visual.image == null) { if (arrayItem.visual.icon.label == null) {
arrayItem.visual.image = ""; arrayItem.visual.icon.label = "";
};
if (arrayItem.visual.icon.name == null) {
arrayItem.visual.icon.name = "";
};
if (arrayItem.visual.icon.prefix == null) {
arrayItem.visual.icon.prefix = "";
}; };
}); });
@ -1083,18 +1066,10 @@ var update = (function() {
b: 0 b: 0
} }
}; };
if (!data.state.link.item.display.visual) { data.state.link.item.display.visual = data.state.link.item.display.letcon;
data.state.link.item.display.visual = data.state.link.item.display.letcon; delete data.state.link.item.display.letcon;
}; data.state.link.item.display.visual.image = {
if (data.state.link.item.display.letcon) { size: 3
delete data.state.link.item.display.letcon;
};
if (data.state.link.item.display.visual) {
if (!data.state.link.item.display.visual.image) {
data.state.link.item.display.visual.image = {
size: 3
};
};
}; };
if (data.state.link.item.display.order == "letconname") { if (data.state.link.item.display.order == "letconname") {
data.state.link.item.display.order = "visualname"; data.state.link.item.display.order = "visualname";