Merge pull request #147 from underscorebrody/linebreak_fix

Fixes issue with carriage return escaping

Gruntfile.js

@@ -254,6 +254,11 @@ module.exports = function(grunt) {
         options: {
           quotes: 'single'
         }
+      },
+
+      linebreak: {
+        src: 'test/fixtures/linebreak.html',
+        dest: 'tmp/linebreak.js',
       }
     }
   });

tasks/lib/compiler.js

@@ -188,6 +188,7 @@ var Compiler = function(grunt, options, cwd, expanded) {
       var quote = options.quotes === 'single' ? '\'' : '"';
 
       line = line.replace(/\n/g, '\\n');
+      line = line.replace(/\r/g, '\\r');
       var quoteRegExp = new RegExp(quote, 'g');
       line = line.replace(quoteRegExp, '\\' + quote);
 

test/angular-templates_test.js

@@ -219,6 +219,16 @@ exports.ngtemplates = {
 
     test.equal(expected, actual);
     test.done();
-  }
+  },
+
+  linebreak: function(test) {
+    test.expect(1);
 
+    var actual    = grunt.file.read('tmp/linebreak.js');
+    var expected  = grunt.file.read('test/expected/linebreak.js');
+
+    test.equal(expected, actual);
+    test.done();
+  }
+
 };

test/expected/linebreak.js

@@ -0,0 +1,10 @@
+angular.module('linebreak').run(['$templateCache', function($templateCache) {
+  'use strict';
+
+  $templateCache.put('test/fixtures/linebreak.html',
+    "<textarea placeholder=\"This is a carriage return.\r" +
+    "\n" +
+    "Also also a newline.\"></textarea>"
+  );
+
+}]);

test/fixtures/linebreak.html

@@ -0,0 +1,2 @@
+<textarea placeholder="This is a carriage return.
+Also also a newline."></textarea>