fix(Grunt): also remove \r chars when joining files

This commit is contained in:
Pete Bacon Darwin 2013-04-16 12:13:55 +01:00
parent ef334d0070
commit 0893e83c92

View file

@ -65,7 +65,7 @@ module.exports = {
var css = fs.readFileSync(file).toString();
if(minify){
css = css
.replace(/\n/g, '')
.replace(/\r?\n/g, '')
.replace(/\/\*.*?\*\//g, '')
.replace(/:\s+/g, ':')
.replace(/\s*\{\s*/g, '{')
@ -73,11 +73,11 @@ module.exports = {
.replace(/\s*\,\s*/g, ',')
.replace(/\s*\;\s*/g, ';');
}
//espace for js
//escape for js
css = css
.replace(/\\/g, '\\\\')
.replace(/'/g, "\\'")
.replace(/\n/g, '\\n');
.replace(/\r?\n/g, '\\n');
return "angular.element(document).find('head').append('<style type=\"text/css\">" + css + "</style>');";
}
},