From 298f5d5615e7bd2099a34d9a6acfa2f3c7fac8fd Mon Sep 17 00:00:00 2001
From: Bram van der Veen <96aa48@gmail.com>
Date: Fri, 19 Jun 2015 21:10:58 +0200
Subject: [PATCH] Added a filter for any \r's or \n's

---
 resources/jade/schedule.jade | 2 +-
 schedule.js                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/jade/schedule.jade b/resources/jade/schedule.jade
index 6adefe3..9ff1739 100644
--- a/resources/jade/schedule.jade
+++ b/resources/jade/schedule.jade
@@ -11,7 +11,7 @@ div.schedule
       div.hour.title
         span= days[match.json.indexOf(day)]
       each hour in day
-        if hour.teacher != 'vrij\r' && hour.teacher != 'vrij'
+        if hour.teacher != 'vrij'
           div.hour(class=hour.changed == 'true' ? 'changed' : '')
             each subhour in hour.teacher
                span.teacher(class='sub_' + hour.teacher.length)
diff --git a/schedule.js b/schedule.js
index e6e562d..cacbc5f 100644
--- a/schedule.js
+++ b/schedule.js
@@ -51,7 +51,7 @@ function to_json(page) {
       for (subhour = 0; subhour < amount_of_special_hours; subhour++) {
          var selected_hour = schedule.find('table').eq(day).find('tr').eq(subhour).find('td');
          //Give the value of the schedule hour to the fitting array.
-         schedule_data[day][hour].teacher[subhour] = selected_hour.eq(0).text();
+         schedule_data[day][hour].teacher[subhour] = selected_hour.eq(0).text().replace(/\r|\n/g, '');
          schedule_data[day][hour].chamber[subhour] = selected_hour.eq(2).text();
          schedule_data[day][hour].course[subhour] = selected_hour.eq(4).text();
          //Check if the hour is 'changed' by the schedule authors, if so set to true.