Skip to content

Added fix for handling of spaces within parenthesis in values. #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NV merged 3 commits into from
Jan 20, 2017
Merged

Added fix for handling of spaces within parenthesis in values. #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57c4610
Added fix for handling of spaces within parenthesis in values. Also …
lightman76 Jan 19, 2017
4919eff
added spec that tests for issue #86 - spaces being removed from calc.
lightman76 Jan 19, 2017
a3b4d7b
Fixed code style issues as requested. Also fixed a problem in the PR…
lightman76 Jan 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion lib/parse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ CSSOM.parse = function parse(token) {

var index;
var buffer = "";
var valueParenthesisDepth = 0;

var SIGNIFICANT_WHITESPACE = {
"selector": true,
"value": true,
"value-parenthesis": true,
"atRule": true,
"importRule-begin": true,
"importRule": true,
Expand Down Expand Up @@ -263,16 +265,23 @@ CSSOM.parse = function parse(token) {
}
} else {
state = 'value-parenthesis';
//always ensure this is reset to 1 on transition
//from value to value-parenthesis
valueParenthesisDepth = 1;
buffer += character;
}
} else if (state === 'value-parenthesis') {
valueParenthesisDepth++;
buffer += character;
} else {
buffer += character;
}
break;

case ")":
if (state === 'value-parenthesis') {
state = 'value';
valueParenthesisDepth--;
if (valueParenthesisDepth === 0) state = 'value';
}
buffer += character;
break;
Expand Down
44 changes: 44 additions & 0 deletions spec/parse.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,50 @@ var TESTS = [
return result;
})()
},
{
input: ".calc{width: calc(100% - 15px);}",
result: (function() {
var result = {
cssRules: [
{
selectorText: '.calc',
parentRule: null,
style: {
0: 'width',
width: 'calc(100% - 15px)',
length: 1
}
}
],
parentStyleSheet: null
};
result.cssRules[0].parentStyleSheet = result;
result.cssRules[0].style.parentRule = result.cssRules[0];
return result;
})()
},
{
input: ".gradient{background-image: linear-gradient(transparent 50%, rgba(69, 142, 209, 0.04) 50%);}",
result: (function() {
var result = {
cssRules: [
{
selectorText: '.gradient',
parentRule: null,
style: {
0: 'background-image',
"background-image": 'linear-gradient(transparent 50%, rgba(69, 142, 209, 0.04) 50%)',
length: 1
}
}
],
parentStyleSheet: null
};
result.cssRules[0].parentStyleSheet = result;
result.cssRules[0].style.parentRule = result.cssRules[0];
return result;
})()
},
{
input: "@media handheld, only screen and (max-device-width: 480px) {body{max-width:480px}}",
result: (function() {
Expand Down