intel-screenbot

commit b4be16039cec808c4d528c7e41da4f17f4bbb94f
parent 5504ea1f09413b45f23f7b7a75c376d467a386b7
Author: Marcel <MTRNord@users.noreply.github.com>
Date:   Mon, 13 Feb 2017 21:05:39 +0100

Try to fix weird \n problems
Diffstat:
M
screencap.js
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/screencap.js b/screencap.js
@@ -324,7 +324,7 @@ function portalinfoText(){
 	var reso8 = page.evaluate(function(){
 	  return document.getElementById("resodetails").rows[3].cells[2].firstElementChild.getAttribute("title");
 	});
-	var text = PortalName + "<br /><br /><b>Resonator 1:</b><br />" + reso1 + "<br /><b>Resonator 2:</b><br />" + reso2 + "<br /><b>Resonator 3:</b><br />" + reso3 + "<br /><b>Resonator 4:</b><br />" + reso4 + "<br /><b>Resonator 5:</b><br />" + reso5 + "<br /><b>Resonator 6:</b><br />" + reso6 + "<br /><b>Resonator 7:</b><br />" + reso7 + "<br /><b>Resonator 8:</b><br />" + reso8 
+	var text = PortalName.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><br /><b>Resonator 1:</b><br />" + reso1.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 2:</b><br />" + reso2.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 3:</b><br />" + reso3.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 4:</b><br />" + reso4.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 5:</b><br />" + reso5.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 6:</b><br />" + reso6.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 7:</b><br />" + reso7.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 8:</b><br />" + reso8.replace(/(?:\r\n|\r|\n)/g, '<br />')
 	console.log(text)
 	fs.write(portalinfoResponse, text, 'w');
         var startTime = new Date().getTime();
@@ -366,7 +366,7 @@ function portalinfoText(){
 	var reso8 = page.evaluate(function(){
 	  return document.getElementById("resodetails").rows[3].cells[2].firstElementChild.getAttribute("title");
 	});
-	var text = PortalName + "<br /><br /><b>Resonator 1:</b><br />" + reso1 + "<br /><b>Resonator 2:</b><br />" + reso2 + "<br /><b>Resonator 3:</b><br />" + reso3 + "<br /><b>Resonator 4:</b><br />" + reso4 + "<br /><b>Resonator 5:</b><br />" + reso5 + "<br /><b>Resonator 6:</b><br />" + reso6 + "<br /><b>Resonator 7:</b><br />" + reso7 + "<br /><b>Resonator 8:</b><br />" + reso8 
+	var text = PortalName.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><br /><b>Resonator 1:</b><br />" + reso1.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 2:</b><br />" + reso2.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 3:</b><br />" + reso3.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 4:</b><br />" + reso4.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 5:</b><br />" + reso5.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 6:</b><br />" + reso6.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 7:</b><br />" + reso7.replace(/(?:\r\n|\r|\n)/g, '<br />') + "<br /><b>Resonator 8:</b><br />" + reso8.replace(/(?:\r\n|\r|\n)/g, '<br />') 
 	console.log(text)
 	fs.write(portalinfoResponse, text, 'w');
         var startTime = new Date().getTime();