Skip to content

Commit 40a1303

Browse files
committed
[refactor] improve update
1 parent 778a86a commit 40a1303

File tree

1 file changed

+27
-44
lines changed

1 file changed

+27
-44
lines changed

‎src/js/update.js‎

Lines changed: 27 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -970,71 +970,35 @@ var update = (function(){
970970
"5.37.1": function(data){
971971
data.bookmarks.forEach(function(arrayItem,index){
972972
arrayItem.items.forEach(function(arrayItem,index){
973+
973974
if(arrayItem.name==null){
974975
arrayItem.name="";
975976
};
977+
if(arrayItem.url==null){
978+
arrayItem.url="";
979+
};
976980
for(varkeyinarrayItem.accent.color){
977-
if(arrayItem.accent.color[key]==null){
981+
if(typeofarrayItem.accent.color[key]!="number"){
978982
arrayItem.accent.color[key]=0;
979983
};
980984
};
981-
});
982-
});
983-
data.bookmarks.forEach(function(arrayItem,index){
984-
arrayItem.items.forEach(function(arrayItem,index){
985-
arrayItem.accent.color.rgb={
985+
arrayItem.accent.rgb={
986986
r: arrayItem.accent.color.r,
987987
g: arrayItem.accent.color.g,
988988
b: arrayItem.accent.color.b
989989
};
990-
if(arrayItem.accent.color.rgb.r==null){
991-
arrayItem.accent.color.rgb.r=0;
992-
};
993-
if(arrayItem.accent.color.rgb.g==null){
994-
arrayItem.accent.color.rgb.g=0;
995-
};
996-
if(arrayItem.accent.color.rgb.b==null){
997-
arrayItem.accent.color.rgb.b=0;
998-
};
999-
arrayItem.accent.color.hsl={
990+
deletearrayItem.accent.color;
991+
arrayItem.accent.hsl={
1000992
h: 0,
1001993
s: 0,
1002994
l: 0
1003995
};
1004-
deletearrayItem.accent.color.r;
1005-
deletearrayItem.accent.color.g;
1006-
deletearrayItem.accent.color.b;
1007-
});
1008-
});
1009-
data.bookmarks.forEach(function(arrayItem,index){
1010-
arrayItem.items.forEach(function(arrayItem,index){
1011-
arrayItem.visual={
1012-
display: arrayItem.display,
1013-
letter: arrayItem.letter,
1014-
image: "",
1015-
icon: arrayItem.icon
1016-
};
1017-
if(arrayItem.visual.icon.label==null){
1018-
arrayItem.visual.icon.label="";
1019-
};
1020-
if(arrayItem.visual.icon.name==null){
1021-
arrayItem.visual.icon.name="";
1022-
};
1023-
if(arrayItem.visual.icon.prefix==null){
1024-
arrayItem.visual.icon.prefix="";
1025-
};
1026-
deletearrayItem.display;
1027-
deletearrayItem.letter;
1028-
deletearrayItem.icon;
1029996
if(arrayItem.accent.override){
1030997
arrayItem.accent.by="custom";
1031998
}else{
1032999
arrayItem.accent.by="theme";
10331000
};
10341001
deletearrayItem.accent.override;
1035-
arrayItem.accent.hsl=arrayItem.accent.color.hsl;
1036-
arrayItem.accent.rgb=arrayItem.accent.color.rgb;
1037-
deletearrayItem.accent.color;
10381002
arrayItem.color={
10391003
by: "theme",
10401004
hsl: {
@@ -1049,6 +1013,25 @@ var update = (function(){
10491013
}
10501014
};
10511015
arrayItem.image="";
1016+
arrayItem.visual={
1017+
display: arrayItem.display,
1018+
letter: arrayItem.letter,
1019+
image: "",
1020+
icon: arrayItem.icon
1021+
};
1022+
deletearrayItem.display;
1023+
deletearrayItem.letter;
1024+
deletearrayItem.icon;
1025+
if(arrayItem.visual.icon.label==null){
1026+
arrayItem.visual.icon.label="";
1027+
};
1028+
if(arrayItem.visual.icon.name==null){
1029+
arrayItem.visual.icon.name="";
1030+
};
1031+
if(arrayItem.visual.icon.prefix==null){
1032+
arrayItem.visual.icon.prefix="";
1033+
};
1034+
10521035
});
10531036
});
10541037
data.state.header.color.hsl={

0 commit comments

Comments
(0)