Skip to content

Whitespace normalization and regex simplification #76

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

Open
chris-canipe wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Whitespace normalization and regex simplification #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2477ff9
Normalize whitespace on stylesheet load.
Aug 14, 2013
fb9bc25
Simplify comment regex.
Aug 14, 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
4 changes: 2 additions & 2 deletions selectivizr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ References:
var namespace = "slvzr";

// Stylesheet parsing regexp's
var RE_COMMENT = /(\/\*[^*]*\*+([^\/][^*]*\*+)*\/)\s*?/g;
var RE_COMMENT = /\/\*[\S\s]*?\*\//g;
var RE_IMPORT = /@import\s*(?:(?:(?:url\(\s*(['"]?)(.*)\1)\s*\))|(?:(['"])(.*)\3))\s*([^;]*);/g;
var RE_ASSET_URL = /(behavior\s*?:\s*)?\burl\(\s*(["']?)(?!data:)([^"')]+)\2\s*\)/g;
var RE_PSEUDO_STRUCTURAL = /^:(empty|(first|last|only|nth(-last)?)-(child|of-type))$/;
Expand Down Expand Up @@ -394,7 +394,7 @@ References:
function loadStyleSheet( url ) {
xhr.open("GET", url, false);
xhr.send();
return (xhr.status==200) ? xhr.responseText : EMPTY_STRING;
return (xhr.status==200) ? normalizeWhitespace(xhr.responseText) : EMPTY_STRING;
};

// --[ resolveUrl() ]---------------------------------------------------
Expand Down