af92753d by David LaPalomento

Merge pull request #329 from ntadej/karma-fix

Properly parse CR+LF on Windows when generating manifests file
2 parents c54d4d66 d0f0fd06
...@@ -300,7 +300,7 @@ module.exports = function(grunt) { ...@@ -300,7 +300,7 @@ module.exports = function(grunt) {
300 // translate this manifest 300 // translate this manifest
301 jsManifests += ' \'' + basename(filename, '.m3u8') + '\': ' + 301 jsManifests += ' \'' + basename(filename, '.m3u8') + '\': ' +
302 grunt.file.read(abspath) 302 grunt.file.read(abspath)
303 .split('\n') 303 .split(/\r\n|\n/)
304 304
305 // quote and concatenate 305 // quote and concatenate
306 .map(function(line) { 306 .map(function(line) {
......