From 7e32e5be8f9c2f5d8f8d9cfaf3fd5e1c4190842a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <gina@octoprint.org>
Date: Thu, 20 Jul 2017 09:18:38 +0200
Subject: [PATCH] GCODE viewer: Support \r, \n and \r\n line endings

So far we only supported \n and \r\n, leading to problems with MM
GCODE files generated by Slic3r Prusa Edition which apparently
produces \r line endings for some reason.

Closes #1996
---
 src/octoprint/static/gcodeviewer/js/gCodeReader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/octoprint/static/gcodeviewer/js/gCodeReader.js b/src/octoprint/static/gcodeviewer/js/gCodeReader.js
index 5dc18981..abc56727 100644
--- a/src/octoprint/static/gcodeviewer/js/gCodeReader.js
+++ b/src/octoprint/static/gcodeviewer/js/gCodeReader.js
@@ -146,7 +146,7 @@ GCODE.gCodeReader = (function(){
             this.clear();
 
             var totalSize = reader.target.result.length;
-            lines = reader.target.result.split(/\n/);
+            lines = reader.target.result.split(/[\r\n]+/g);
             reader.target.result = null;
             prepareGCode(totalSize);