Skip to content

Commit 37ff437

Browse files
asamuzaKasamuzaK
committed
Refactor border property variable naming
Replaces all instances of the variable 'nameItem' with 'shorthandItem'. No functional changes were made; this is a variable renaming for better meaning and code readability.
1 parent a35b915 commit 37ff437

File tree

1 file changed

+40
-36
lines changed

1 file changed

+40
-36
lines changed

‎lib/normalize.js‎

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ const prepareBorderStringValue = ({
526526
globalObject,
527527
options
528528
};
529-
const nameItem = getPropertyItem(BORDER, properties);
529+
const shorthandItem = getPropertyItem(BORDER, properties);
530530
const imageItem = getPropertyItem(BORDER_IMAGE, properties);
531531
// Handle longhand properties.
532532
if (prop3) {
@@ -540,12 +540,12 @@ const prepareBorderStringValue = ({
540540
longhandItem.priority = priority;
541541
const propertyValue = hasVarFunc(value) ? "" : value;
542542
if (propertyValue === "") {
543-
nameItem.value = "";
543+
shorthandItem.value = "";
544544
lineItem.value = "";
545545
positionItem.value = "";
546546
} else if (isGlobalKeyword(propertyValue)) {
547-
if (nameItem.value !== propertyValue) {
548-
nameItem.value = "";
547+
if (shorthandItem.value !== propertyValue) {
548+
shorthandItem.value = "";
549549
}
550550
if (lineItem.value !== propertyValue) {
551551
lineItem.value = "";
@@ -555,10 +555,10 @@ const prepareBorderStringValue = ({
555555
}
556556
} else {
557557
if (
558-
nameItem.value &&
559-
!matchesBorderShorthandValue(lineProperty, propertyValue, nameItem.value, parseOpt)
558+
shorthandItem.value &&
559+
!matchesBorderShorthandValue(lineProperty, propertyValue, shorthandItem.value, parseOpt)
560560
) {
561-
nameItem.value = "";
561+
shorthandItem.value = "";
562562
}
563563
if (lineItem.value) {
564564
lineItem.value = replacePositionValue(propertyValue, splitValue(lineItem.value), prop2);
@@ -570,7 +570,7 @@ const prepareBorderStringValue = ({
570570
positionItem.value = "";
571571
}
572572
}
573-
borderItems.set(BORDER, nameItem);
573+
borderItems.set(BORDER, shorthandItem);
574574
borderItems.set(BORDER_IMAGE, imageItem);
575575
borderItems.set(lineProperty, lineItem);
576576
borderItems.set(positionProperty, positionItem);
@@ -589,13 +589,13 @@ const prepareBorderStringValue = ({
589589
positionItem.priority = priority;
590590
const propertyValue = hasVarFunc(value) ? "" : value;
591591
if (propertyValue === "") {
592-
nameItem.value = "";
592+
shorthandItem.value = "";
593593
lineWidthItem.value = "";
594594
lineStyleItem.value = "";
595595
lineColorItem.value = "";
596596
} else if (isGlobalKeyword(propertyValue)) {
597-
if (nameItem.value !== propertyValue) {
598-
nameItem.value = "";
597+
if (shorthandItem.value !== propertyValue) {
598+
shorthandItem.value = "";
599599
}
600600
if (lineWidthItem.value !== propertyValue) {
601601
lineWidthItem.value = "";
@@ -608,10 +608,10 @@ const prepareBorderStringValue = ({
608608
}
609609
} else {
610610
if (
611-
nameItem.value &&
612-
!matchesBorderShorthandValue(property, propertyValue, nameItem.value, parseOpt)
611+
shorthandItem.value &&
612+
!matchesBorderShorthandValue(property, propertyValue, shorthandItem.value, parseOpt)
613613
) {
614-
nameItem.value = "";
614+
shorthandItem.value = "";
615615
}
616616
if (
617617
lineWidthItem.value &&
@@ -639,7 +639,7 @@ const prepareBorderStringValue = ({
639639
longhandItem.priority = priority;
640640
borderItems.set(longhandProperty, longhandItem);
641641
}
642-
borderItems.set(BORDER, nameItem);
642+
borderItems.set(BORDER, shorthandItem);
643643
borderItems.set(BORDER_IMAGE, imageItem);
644644
borderItems.set(lineWidthProperty, lineWidthItem);
645645
borderItems.set(lineStyleProperty, lineStyleItem);
@@ -653,10 +653,10 @@ const prepareBorderStringValue = ({
653653
lineItem.priority = priority;
654654
const propertyValue = hasVarFunc(value) ? "" : value;
655655
if (propertyValue === "") {
656-
nameItem.value = "";
656+
shorthandItem.value = "";
657657
} else if (isGlobalKeyword(propertyValue)) {
658-
if (nameItem.value !== propertyValue) {
659-
nameItem.value = "";
658+
if (shorthandItem.value !== propertyValue) {
659+
shorthandItem.value = "";
660660
}
661661
}
662662
for (const position of borderPositions) {
@@ -678,7 +678,7 @@ const prepareBorderStringValue = ({
678678
borderItems.set(positionProperty, positionItem);
679679
borderItems.set(longhandProperty, longhandItem);
680680
}
681-
borderItems.set(BORDER, nameItem);
681+
borderItems.set(BORDER, shorthandItem);
682682
borderItems.set(BORDER_IMAGE, imageItem);
683683
borderItems.set(lineProperty, lineItem);
684684
// Handle border shorthand.
@@ -706,7 +706,7 @@ const prepareBorderStringValue = ({
706706
borderItems.set(longhandProperty, longhandItem);
707707
}
708708
}
709-
borderItems.set(property, nameItem);
709+
borderItems.set(property, shorthandItem);
710710
borderItems.set(BORDER_IMAGE, imageItem);
711711
}
712712
};
@@ -732,21 +732,25 @@ const prepareBorderArrayValue = ({ value, priority, properties, parts, opt, bord
732732
if (!value.length || !borderLines.has(prop2)) {
733733
return;
734734
}
735-
const nameItem = getPropertyItem(BORDER, properties);
735+
const shorthandItem = getPropertyItem(BORDER, properties);
736736
const imageItem = getPropertyItem(BORDER_IMAGE, properties);
737737
const lineProperty = `${prop1}-${prop2}`;
738738
const lineItem = getPropertyItem(lineProperty, properties);
739739
if (value.length === 1) {
740740
const [propertyValue] = value;
741-
if (nameItem.value) {
742-
if (hasVarFunc(nameItem.value)) {
743-
nameItem.value = "";
741+
if (shorthandItem.value) {
742+
if (hasVarFunc(shorthandItem.value)) {
743+
shorthandItem.value = "";
744744
} else if (propertyValue) {
745-
nameItem.value = replaceBorderShorthandValue(propertyValue, nameItem.value, parseOpt);
745+
shorthandItem.value = replaceBorderShorthandValue(
746+
propertyValue,
747+
shorthandItem.value,
748+
parseOpt
749+
);
746750
}
747751
}
748752
} else {
749-
nameItem.value = "";
753+
shorthandItem.value = "";
750754
}
751755
lineItem.value = value.join(" ");
752756
lineItem.priority = priority;
@@ -799,7 +803,7 @@ const prepareBorderArrayValue = ({ value, priority, properties, parts, opt, bord
799803
borderItems.set(positionProperty, positionItem);
800804
borderItems.set(longhandProperty, longhandItem);
801805
}
802-
borderItems.set(BORDER, nameItem);
806+
borderItems.set(BORDER, shorthandItem);
803807
borderItems.set(BORDER_IMAGE, imageItem);
804808
borderItems.set(lineProperty, lineItem);
805809
};
@@ -837,7 +841,7 @@ const prepareBorderObjectValue = ({
837841
if (!borderPositions.has(prop2)) {
838842
return;
839843
}
840-
const nameItem = getPropertyItem(BORDER, properties);
844+
const shorthandItem = getPropertyItem(BORDER, properties);
841845
const lineWidthProperty = `${prop1}-width`;
842846
const lineWidthItem = getPropertyItem(lineWidthProperty, properties);
843847
const lineStyleProperty = `${prop1}-style`;
@@ -846,10 +850,10 @@ const prepareBorderObjectValue = ({
846850
const lineColorItem = getPropertyItem(lineColorProperty, properties);
847851
const positionProperty = `${prop1}-${prop2}`;
848852
const positionItem = getPropertyItem(positionProperty, properties);
849-
if (nameItem.value) {
853+
if (shorthandItem.value) {
850854
for (const positionValue of Object.values(value)) {
851-
if (!matchesBorderShorthandValue(property, positionValue, nameItem.value, parseOpt)) {
852-
nameItem.value = "";
855+
if (!matchesBorderShorthandValue(property, positionValue, shorthandItem.value, parseOpt)) {
856+
shorthandItem.value = "";
853857
break;
854858
}
855859
}
@@ -885,24 +889,24 @@ const prepareBorderObjectValue = ({
885889
longhandItem.priority = priority;
886890
borderItems.set(longhandProperty, longhandItem);
887891
}
888-
borderItems.set(BORDER, nameItem);
892+
borderItems.set(BORDER, shorthandItem);
889893
borderItems.set(BORDER_IMAGE, imageItem);
890894
borderItems.set(lineWidthProperty, lineWidthItem);
891895
borderItems.set(lineStyleProperty, lineStyleItem);
892896
borderItems.set(lineColorProperty, lineColorItem);
893897
borderItems.set(positionProperty, positionItem);
894898
// Handle border shorthand.
895899
} else {
896-
const nameItem = getPropertyItem(prop1, properties);
900+
const shorthandItem = getPropertyItem(prop1, properties);
897901
const lineWidthProperty = `${prop1}-width`;
898902
const lineWidthItem = getPropertyItem(lineWidthProperty, properties);
899903
const lineStyleProperty = `${prop1}-style`;
900904
const lineStyleItem = getPropertyItem(lineStyleProperty, properties);
901905
const lineColorProperty = `${prop1}-color`;
902906
const lineColorItem = getPropertyItem(lineColorProperty, properties);
903907
const propertyValue = Object.values(value).join(" ");
904-
nameItem.value = propertyValue;
905-
nameItem.priority = priority;
908+
shorthandItem.value = propertyValue;
909+
shorthandItem.priority = priority;
906910
imageItem.value = propertyValue ? NONE : "";
907911
if (Object.hasOwn(value, lineWidthProperty)) {
908912
lineWidthItem.value = value[lineWidthProperty];
@@ -941,7 +945,7 @@ const prepareBorderObjectValue = ({
941945
}
942946
borderItems.set(positionProperty, positionItem);
943947
}
944-
borderItems.set(property, nameItem);
948+
borderItems.set(property, shorthandItem);
945949
borderItems.set(BORDER_IMAGE, imageItem);
946950
borderItems.set(lineWidthProperty, lineWidthItem);
947951
borderItems.set(lineStyleProperty, lineStyleItem);

0 commit comments

Comments
 (0)