Skip to content

Commit b972e2c

Browse files
committed
[refactor] improve update
1 parent 99dbba6 commit b972e2c

File tree

1 file changed

+27
-52
lines changed

1 file changed

+27
-52
lines changed

‎src/js/update.js‎

Lines changed: 27 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -982,20 +982,12 @@ var update = (function(){
982982
arrayItem.accent.color[key]=0;
983983
};
984984
};
985-
if(arrayItem.accent.color){
986-
arrayItem.accent.rgb={
987-
r: arrayItem.accent.color.r,
988-
g: arrayItem.accent.color.g,
989-
b: arrayItem.accent.color.b
990-
};
991-
deletearrayItem.accent.color;
992-
}elseif(!arrayItem.accent.rgb){
993-
arrayItem.accent.rgb={
994-
r: 0,
995-
g: 0,
996-
b: 0
997-
};
985+
arrayItem.accent.rgb={
986+
r: arrayItem.accent.color.r,
987+
g: arrayItem.accent.color.g,
988+
b: arrayItem.accent.color.b
998989
};
990+
deletearrayItem.accent.color;
999991
arrayItem.accent.hsl={
1000992
h: 0,
1001993
s: 0,
@@ -1021,35 +1013,26 @@ var update = (function(){
10211013
}
10221014
};
10231015
arrayItem.image="";
1024-
if(!arrayItem.visual){
1025-
arrayItem.visual={
1026-
display: arrayItem.display,
1027-
letter: arrayItem.letter,
1028-
image: "",
1029-
icon: arrayItem.icon
1030-
};
1031-
deletearrayItem.display;
1032-
deletearrayItem.letter;
1033-
deletearrayItem.icon;
1034-
if(arrayItem.visual.letter==null){
1035-
arrayItem.visual.letter="";
1036-
};
1016+
arrayItem.visual={
1017+
display: arrayItem.display,
1018+
letter: arrayItem.letter,
1019+
image: "",
1020+
icon: arrayItem.icon
10371021
};
1038-
if(arrayItem.visual){
1039-
if(arrayItem.visual.icon){
1040-
if(arrayItem.visual.icon.label==null){
1041-
arrayItem.visual.icon.label="";
1042-
};
1043-
if(arrayItem.visual.icon.name==null){
1044-
arrayItem.visual.icon.name="";
1045-
};
1046-
if(arrayItem.visual.icon.prefix==null){
1047-
arrayItem.visual.icon.prefix="";
1048-
};
1049-
};
1022+
deletearrayItem.display;
1023+
deletearrayItem.letter;
1024+
deletearrayItem.icon;
1025+
if(arrayItem.visual.letter==null){
1026+
arrayItem.visual.letter="";
1027+
};
1028+
if(arrayItem.visual.icon.label==null){
1029+
arrayItem.visual.icon.label="";
10501030
};
1051-
if(arrayItem.visual.image==null){
1052-
arrayItem.visual.image="";
1031+
if(arrayItem.visual.icon.name==null){
1032+
arrayItem.visual.icon.name="";
1033+
};
1034+
if(arrayItem.visual.icon.prefix==null){
1035+
arrayItem.visual.icon.prefix="";
10531036
};
10541037

10551038
});
@@ -1083,18 +1066,10 @@ var update = (function(){
10831066
b: 0
10841067
}
10851068
};
1086-
if(!data.state.link.item.display.visual){
1087-
data.state.link.item.display.visual=data.state.link.item.display.letcon;
1088-
};
1089-
if(data.state.link.item.display.letcon){
1090-
deletedata.state.link.item.display.letcon;
1091-
};
1092-
if(data.state.link.item.display.visual){
1093-
if(!data.state.link.item.display.visual.image){
1094-
data.state.link.item.display.visual.image={
1095-
size: 3
1096-
};
1097-
};
1069+
data.state.link.item.display.visual=data.state.link.item.display.letcon;
1070+
deletedata.state.link.item.display.letcon;
1071+
data.state.link.item.display.visual.image={
1072+
size: 3
10981073
};
10991074
if(data.state.link.item.display.order=="letconname"){
11001075
data.state.link.item.display.order="visualname";

0 commit comments

Comments
(0)