Skip to content
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

fixed problems with colon character #363

Closed
wants to merge 12 commits into from
Closed

fixed problems with colon character #363

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
14743e1
fixed problems with colon character
Nov 18, 2013
43c06e9
fixed formatting troubles
Nov 18, 2013
306f321
added tests for colon character
Nov 20, 2013
792c615
new method to fix the colon bug
Nov 20, 2013
7b529dc
fixed edge case with content and not elements
Nov 20, 2013
eab7b74
added test for particular edge case with braces and semicolons inside…
Nov 20, 2013
b457034
removed commented console.log
Nov 20, 2013
2eb49a2
fixed typo
Nov 20, 2013
398843b
moved regex at top of the script and fixed bug with documents startin…
Nov 20, 2013
e0ca5ad
Update beautify-css.js
Nov 20, 2013
c80476f
fixed extra space in test
Nov 20, 2013
10bee4d
Update beautify-tests.js
Nov 22, 2013
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
19 changes: 17 additions & 2 deletions js/lib/beautify-css.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,19 @@

function peek() {
return source_text.charAt(pos + 1);
}

function getrow() {
var test1 = source_text.substr(pos, source_text.indexOf(';') + 1);
var test2 = source_text.substr(pos, source_text.indexOf('{') + 1);

if(test1.length > test2.length) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please match the style of the file: 4 spaces per tab, space between if keyword and opening paren.

return test2;
} else {
return test1;
}
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trailing spaces should be stripped.

function eatString(endChar) {
var start = pos;
while (next()) {
Expand Down Expand Up @@ -233,7 +244,11 @@
insideRule = false;
} else if (ch === ":") {
eatWhitespace();
output.push(ch, " ");
if(getrow().indexOf("{") !== -1){
output.push(ch);
} else {
output.push(ch, " ");
}
insideRule = true;
} else if (ch === '"' || ch === '\'') {
output.push(eatString(ch));
Expand Down