Skip to content
This repository was archived by the owner on Feb 9, 2018. It is now read-only.

Commit 4d382f2

Browse files
committed
rename parsePositionValue => consumePositionValue for consistency
1 parent a763a2b commit 4d382f2

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

src/parsing/css-position-value-parsing.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
(function(internal) {
1616

17-
function parsePositionValue(str) {
17+
function consumePositionValue(str) {
1818
var params = internal.parsing.consumeRepeated(
1919
internal.parsing.consumeLengthValue,
2020
null, // separator not required due to use of consumeTrimmed.
@@ -23,8 +23,9 @@
2323
return null;
2424
}
2525
var lengths = params[0];
26-
return [new CSSPositionValue(lengths[0], lengths[1]), params[1]];
26+
var remaining = params[1];
27+
return [new CSSPositionValue(lengths[0], lengths[1]), remaining];
2728
}
2829

29-
internal.parsing.parsePositionValue = parsePositionValue;
30+
internal.parsing.consumePositionValue = consumePositionValue;
3031
})(typedOM.internal);

test/js/css-position-value.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,30 @@ suite('CSSPositionValue', function() {
2929

3030
test('Parsing works for simple values', function() {
3131
var input = '5px 3px';
32-
var result = typedOM.internal.parsing.parsePositionValue(input);
32+
var result = typedOM.internal.parsing.consumePositionValue(input);
3333
assert.strictEqual(result[0].constructor, CSSPositionValue);
3434
assert.strictEqual(result[0].cssText, input);
3535
});
3636

3737
test('Parsing works when using calc values', function() {
3838
var input = 'calc(-2% + 6em) calc(3vmin - 9pc)';
39-
var result = typedOM.internal.parsing.parsePositionValue(input);
39+
var result = typedOM.internal.parsing.consumePositionValue(input);
4040
assert.strictEqual(result[0].constructor, CSSPositionValue);
4141
assert.strictEqual(result[0].cssText, input);
4242
});
4343

4444
test('Parsing works when using mixed value types', function() {
4545
var input = '99.2px calc(3vmin - 9pc)';
46-
var result = typedOM.internal.parsing.parsePositionValue(input);
46+
var result = typedOM.internal.parsing.consumePositionValue(input);
4747
assert.strictEqual(result[0].constructor, CSSPositionValue);
4848
assert.strictEqual(result[0].cssText, input);
4949
});
5050

5151
test('Invalid input to parsing returns null (and does not throw)', function() {
52-
assert.isNull(typedOM.internal.parsing.parsePositionValue(''));
53-
assert.isNull(typedOM.internal.parsing.parsePositionValue('bananas'));
54-
assert.isNull(typedOM.internal.parsing.parsePositionValue('5px'));
55-
assert.isNull(typedOM.internal.parsing.parsePositionValue('6px 3'));
56-
assert.isNull(typedOM.internal.parsing.parsePositionValue('calc(3px - 3em 6px'));
52+
assert.isNull(typedOM.internal.parsing.consumePositionValue(''));
53+
assert.isNull(typedOM.internal.parsing.consumePositionValue('bananas'));
54+
assert.isNull(typedOM.internal.parsing.consumePositionValue('5px'));
55+
assert.isNull(typedOM.internal.parsing.consumePositionValue('6px 3'));
56+
assert.isNull(typedOM.internal.parsing.consumePositionValue('calc(3px - 3em 6px'));
5757
});
5858
});

0 commit comments

Comments
 (0)