--- loncom/interface/coursecatalog.pm	2015/05/04 15:43:48	1.86
+++ loncom/interface/coursecatalog.pm	2015/06/09 21:22:55	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.86 2015/05/04 15:43:48 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.88 2015/06/09 21:22:55 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -295,6 +295,7 @@ ENDTOGGJS
                 if (!$deeper) {
                     $alert = &mt('Choose a category to display');
                 }
+                &js_escape(\$alert);
                 $catjs .= <<ENDJS;
 function check_selected() {
     if (document.coursecats.$selitem.options[document.coursecats.$selitem.selectedIndex].value == "") {
@@ -454,10 +455,10 @@ sub instcode_course_selector {
              '</script>';
     if ($totcodes) {
         if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) {
-            $add_entries{'onLoad'} = 'setElements();';
+            $add_entries{'onload'} = 'setElements();';
         }
         if (&user_is_dc($codedom) || $canviewall) {
-            $add_entries{'onLoad'} .= ' toggleStatuses();toggleWasActive();'
+            $add_entries{'onload'} .= ' toggleStatuses();toggleWasActive();'
         }
         &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype);
         my $cat_maxdepth = $env{'form.catalog_maxdepth'};