From 0893e83c92108a057fff48a316b8a51dfec735ce Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin
Date: Tue, 16 Apr 2013 12:13:55 +0100
Subject: fix(Grunt): also remove \r chars when joining files

---
 lib/grunt/utils.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js
index abc71816..0c1fd8ca 100644
--- a/lib/grunt/utils.js
+++ b/lib/grunt/utils.js
@@ -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>');";
     }
   },
-- 
cgit v1.2.3