Merge branch 'staging' into master.

- Fixes the search bar bug
- Re-adds missing course title tooltipss on the schedule

app/assets/javascripts/views/index.js

@@ -25,10 +25,10 @@ Yacs.views.index = function () {
     var key = event.keyCode;
     if (!(event.ctrlKey || event.metaKey)) {
       if ((key >= 48 && key <= 105) || key == 32) {
-        if (key == 127 && searchbar.value.length <= 1)
-          Yacs.views.departments(content);
+        // normal keys focus the searchbar
         searchbar.focus();
       } else if (key == 13) {
+        // enter searches
         if (searchbar.value) {
           Yacs.models.courses.query({ search: searchbar.value,
                                       show_sections: true,
@@ -37,11 +37,7 @@ Yacs.views.index = function () {
               if (success)
                 Yacs.views.courses(content, data);
           });
-        } else {
-          Yacs.views.departments(content);
         }
-      } else if ((key == 8 || key == 46) && searchbar.value.length <= 1) {
-        Yacs.views.departments(content);
       }
     }
   });

app/assets/javascripts/views/schedules.js

@@ -62,7 +62,8 @@ Yacs.views.schedule = function (target) {
               section.department_code + ' ' + section.course_number + ' - ' + section.name,
               section.crn,
               section.instructors[0] || ''
-            ]
+            ],
+            tooltip: section.course_name,
           });
         });
       });
@@ -80,7 +81,7 @@ Yacs.views.schedule = function (target) {
     var data = processSchedules(schedules);
     scheduleData = data.schedules;
     schedule.destroy();
-    schedule = new Schedule(scheduleElement, 
+    schedule = new Schedule(scheduleElement,
       { timeBegin: Math.ceil((data.start) / 60) * 60,
         timeSpan: Math.ceil((data.end - data.start) / 60) * 60 });
     scheduleCountElement.textContent = scheduleData.length;
@@ -130,9 +131,10 @@ Yacs.views.schedule = function (target) {
       scheduleStatusElement.textContent = "";
       scheduleNumElement.textContent = 0;
     } else {
-      schedule.setEvents(scheduleData[index].events)
+      schedule.setEvents(scheduleData[index].events);
       scheduleNumElement.textContent = index + 1;
-      scheduleStatusElement.textContent = 'CRNs: ' + scheduleData[index].crns.join(', ');
+      scheduleStatusStr = 'CRNs: ' + scheduleData[index].crns.join(', ');
+      scheduleStatusElement.textContent = scheduleStatusStr;
     }
   };
 

vendor/assets/javascripts/schedule/schedule.js

@@ -51,6 +51,10 @@ window.Schedule = function (scheduleContainer, options) {
     eventElement.style.borderColor        = BORDER_COLORS[colorIndex];
     eventBackground.style.backgroundColor = BACKGROUND_COLORS[colorIndex];
 
+    if ('tooltip' in event) {
+      eventElement.title = event.tooltip;
+    }
+
     eventElement.appendChild(eventBackground);
     eventElement.appendChild(eventText);
     scheduleElement.appendChild(eventElement);