Merge pull request #99 from JoelEager/master

A bunch of bug fixes and improvements (see description)

Author: bgrawi

assets/src/modules/sm/App/controllers/AppController.js

@@ -73,7 +73,6 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 		// Check if state version exists or is correct
 		if(storedState.hasOwnProperty('meta') && storedState.meta.stateVersion == $scope.stateVersion) {
 			$scope.state = storedState;
-			console.log('asdjasdjk');
 			if(!$scope.state.displayOptions.hasOwnProperty('creditWarning') || !$scope.state.displayOptions.creditWarning) {
 				$scope.state.displayOptions.creditWarning = 18;
 			}

assets/src/modules/sm/Schedule/directives/scheduleDirective.js

@@ -144,9 +144,9 @@ angular.module('sm').directive('schedule', function($timeout, $filter) {
 				courseNum = '';
 			}
 			this.scope.scheduleItems.push({
-				title:course.title,
+				title: course.title.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&$quot;/g, "\"").replace(/&#039;/g, "\'"),
 				content: {
-				    location: location ,
+				    location: location,
 				    courseNum: courseNum,
 				    instructor: instructor
 				},
@@ -159,7 +159,6 @@ angular.module('sm').directive('schedule', function($timeout, $filter) {
 				},
 				color: this.scope.ui.colors[course.courseIndex?(course.courseIndex - 1):this.courseDrawIndex - 1 % 10]
 			});
-			
 		}
 	};
 

assets/src/modules/sm/Schedule/directives/svgTextLineDirective.js

@@ -4,13 +4,14 @@ angular.module('sm').directive('svgTextLine', function() {
 			var text = attrs.svgTextLine;
 			var adjust = (scope.print)? 1: 0;
 			var cutoff = 25 + (adjust * -7);
-			if(scope.grid.days.length > 3) {
-				if(text.length > 14) {
+			
+			if (scope.grid.days.length > 3) {
+				if (text.length > 14) {
 					element = elm.get(0);
-					element.setAttribute("textLength", (parseFloat(scope.grid.opts.daysWidth) + 1 - adjust )+ "%");
+					element.setAttribute("textLength", (parseFloat(scope.grid.opts.daysWidth) - 1) + "%");
 					element.setAttribute("lengthAdjust", "spacingAndGlyphs");
 				}
-				if(text.length > cutoff) {
+				if (text.length > cutoff) {
 					text = text.slice(0, cutoff - 3) + '...';
 				}
 			}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "schedulemaker",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "private": true,
   "description": "A course database lookup tool and schedule building web application for use at Rochester Institute of Technology.",
   "main": "index.php",

readme.md

@@ -2,11 +2,10 @@
 A course database lookup tool and schedule building web application for use at Rochester Institute of Technology.
 
 Instructions for setting up a dev environment:
-	1. Install Apache (Use on XAMPP Windows: https://www.apachefriends.org/index.html)
-	2. Install Node.js: https://nodejs.org/en/
-	3. Clone either the master or a fork of this repo to your local machine
-	4. Copy the config.example.php file to config.php in /inc/
-	5. Contact a current dev to help with server/database config.
+>1. Install Apache (Use XAMPP if you're on Windows: https://www.apachefriends.org/index.html)
+>2. Install Node.js: https://nodejs.org/en/
+>3. Clone either the master or a fork of this repo to your local machine
+>4. Copy the config.example.php file to config.php in /inc/
+>5. Contact a current dev to help with server/database config.
 
-To build js files:
-	Run "npm run-script build"
+To build js files run "npm run-script build"