Skip to content

Commit 3653fc4

Browse files
committed
Revert bitwise part1
1 parent dca851d commit 3653fc4

File tree

6 files changed

+21
-11
lines changed

6 files changed

+21
-11
lines changed

lib/properties/backgroundPosition.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,27 @@ var parse = function parse(v) {
1313
return undefined;
1414
}
1515
var types = [];
16-
var typeLengthOrPercent = parsers.TYPES.LENGTH | parsers.TYPES.PERCENT;
17-
var typeKeyword = parsers.TYPES.KEYWORD;
1816
parts.forEach(function (part, index) {
1917
types[index] = parsers.valueType(part);
2018
});
2119
if (parts.length === 1) {
22-
if (types[0] & typeLengthOrPercent) {
20+
if (types[0] === parsers.TYPES.LENGTH || types[0] === parsers.TYPES.PERCENT) {
2321
return v;
2422
}
25-
if (types[0] === typeKeyword) {
23+
if (types[0] === parsers.TYPES.KEYWORD) {
2624
if (valid_keywords.indexOf(v.toLowerCase()) !== -1 || v.toLowerCase() === 'inherit') {
2725
return v;
2826
}
2927
}
3028
return undefined;
3129
}
32-
if (types[0] & typeLengthOrPercent && types[1] & typeLengthOrPercent) {
30+
if (
31+
(types[0] === parsers.TYPES.LENGTH || types[0] === parsers.TYPES.PERCENT) &&
32+
(types[1] === parsers.TYPES.LENGTH || types[1] === parsers.TYPES.PERCENT)
33+
) {
3334
return v;
3435
}
35-
if (types[0] !== typeKeyword || types[1] !== typeKeyword) {
36+
if (types[0] !== parsers.TYPES.KEYWORD || types[1] !== parsers.TYPES.KEYWORD) {
3637
return undefined;
3738
}
3839
if (valid_keywords.indexOf(parts[0]) !== -1 && valid_keywords.indexOf(parts[1]) !== -1) {

lib/properties/fontFamily.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports.isValid = function isValid(v) {
1414
var type;
1515
for (i = 0; i < len; i++) {
1616
type = valueType(parts[i]);
17-
if (type & (TYPES.STRING | TYPES.KEYWORD)) {
17+
if (type === TYPES.STRING || type === TYPES.KEYWORD) {
1818
return true;
1919
}
2020
}

lib/properties/fontSize.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ var relativeSizes = ['larger', 'smaller'];
1010
module.exports.isValid = function (v) {
1111
var type = valueType(v.toLowerCase());
1212
return (
13-
type & (TYPES.LENGTH | TYPES.PERCENT) ||
13+
type === TYPES.LENGTH ||
14+
type === TYPES.PERCENT ||
1415
(type === TYPES.KEYWORD && absoluteSizes.indexOf(v.toLowerCase()) !== -1) ||
1516
(type === TYPES.KEYWORD && relativeSizes.indexOf(v.toLowerCase()) !== -1)
1617
);

lib/properties/lineHeight.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ module.exports.isValid = function isValid(v) {
88
return (
99
(type === TYPES.KEYWORD && v.toLowerCase() === 'normal') ||
1010
v.toLowerCase() === 'inherit' ||
11-
type & (TYPES.NUMBER | TYPES.LENGTH | TYPES.PERCENT | TYPES.CALC)
11+
type === TYPES.NUMBER ||
12+
type === TYPES.LENGTH ||
13+
type === TYPES.PERCENT
1214
);
1315
};
1416

lib/properties/margin.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ var isValid = function (v) {
99
}
1010
var type = parsers.valueType(v);
1111
return (
12-
type & (TYPES.NULL_OR_EMPTY_STR | TYPES.LENGTH | TYPES.PERCENT | TYPES.CALC) ||
12+
type === TYPES.NULL_OR_EMPTY_STR ||
13+
type === TYPES.LENGTH ||
14+
type === TYPES.PERCENT ||
15+
type === TYPES.CALC ||
1316
(type === TYPES.NUMBER && parseFloat(v) === 0)
1417
);
1518
};

lib/properties/padding.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ var TYPES = parsers.TYPES;
66
var isValid = function (v) {
77
var type = parsers.valueType(v);
88
return (
9-
type & (TYPES.NULL_OR_EMPTY_STR | TYPES.LENGTH | TYPES.PERCENT | TYPES.CALC) ||
9+
type === TYPES.NULL_OR_EMPTY_STR ||
10+
type === TYPES.LENGTH ||
11+
type === TYPES.PERCENT ||
12+
type === TYPES.CALC ||
1013
(type === TYPES.NUMBER && parseFloat(v) === 0)
1114
);
1215
};

0 commit comments

Comments
 (0)