SlatePermutate Changeset - 19dd656b4b02 · protofusion repositories

Changeset - 19dd656b4b02

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 14 years ago 2011-04-09 17:06:34
ohnobinki@ohnopublishing.net

Try to perform an autocomplete request when the user pressed <ENTER> without selecting an autocomplete item. Fixes bug 97.

1 file changed with 108 insertions and 26 deletions:

scripts/scheduleInput.js

108

0 comments (0 inline, 0 general)

scripts/scheduleInput.js

➞

Show inline comments

@@ @@ -37,24 +37,31 @@ var sectionsOfClass = new Array(); @@
  *   added to a given course.
+ *
  * Necessary to support PHP-style post array thingies, like
  * classes[0][1][$x] would be all of the data for course_i=0,
  * section_i=1, variable $x (ex. day of week, start time, end time,
  * teacher). We can't have two sections for a given course using the
  * same section_i because those values would override eachother.
  */
 var last_section_i = 0;
 /**
  * \brief
  *   A quick hash to prevent there from being two AJAX requests for a
  *   given course at one time.
  */
 var course_ajax_requests = [];
 /**
  * \brief
  *   The course number which contains nothing.
+ *
  * To avoid having a user need to click the ``Add course'' button, we
  * keep a course added at the end of the list of courses. If this
  * variable is -1, it indicates that no such free course exists. If it
  * is zero or greater, that number is the class which is the free one.
  */
 var slate_permutate_course_free = -1;
 /*
  * General Input Functions
  */
@@ @@ -211,24 +218,34 @@ function add_section(cnum) @@
+}
 /**
  * Add a list of sections gotten via an AJAX call.
  */
 function add_sections(cnum, data)
+{
     var i;
     if (data.title)
 	jQuery('.pclass' + cnum + ' .course-title-entry').val(data.title);
     /*
      * If the user enterred something iffy, correct him. Or do so
      * regardless ;-).
      */
     /* this data['class'] stuff is for the old JSON format we used... */
     if (data['class'])
 	data.course = data['class'];
     if (data.course)
 	jQuery('.className' + cnum).val(data.course);
     if (!data.sections)
 	return;
     /*
      * we get the sections in the correct order. For the user to see
      * them in the correct order, we must reverse the add_setion_n()
      * calls.
      */
     for (i = data.sections.length - 1; i >= 0; i --)
+	{
 	    section = data.sections[i];
 	    add_section_n(cnum, section.section, section.synonym, section.time_start, section.time_end, section.days, section.instructor, section.location, section.type);
+	}
@@ @@ -256,68 +273,45 @@ function add_sections(cnum, data) @@
  *   The javascript-local course entry identifying number.
  */
 function add_class_n(course_id, title)
+{
     /*
      * If we're adding a course entry form with preadded
      * content, first remove the empty course.
      */
     if (course_id.length && slate_permutate_course_free != -1)
 	course_remove(slate_permutate_course_free);
     sectionsOfClass[classNum] = 0; // Initialize at 0
     course_ajax_requests[classNum] = false;
     jQuery('#jsrows').append('<tr id="tr-course-' + classNum + '" class="class class' + classNum + ' pclass' + classNum + '"><td class="nameTip"><input type="text" id="input-course-' + classNum + '" class="classRequired defText className'+classNum+' className" title="Class Name" name="postData[' + classNum + '][name]" /></td><td colspan="10"><input type="text" name="postData[' + classNum + '][title]" class="inPlace course-title-entry" /></td><td class="tdInput"><div class="deleteClass"><input type="button" value="Remove" class="gray" /></div></td><td class="none"><button type="button" class="addSection gray">+</button></td></tr>');
 		/* store classNum as course_i into the <tr />: */
     var tr_course = jQuery('#tr-course-' + classNum);
     tr_course.data({course_i: classNum});
     tr_course.find('.course-title-entry').val(title);
     tr_course.find('.className').val(course_id);
 		var class_elem = jQuery('.className' + classNum);
 		class_elem.autocomplete({ source: 'auto.php?school=' + slate_permutate_school + '&semester=' + slate_permutate_semester });
 		class_elem.bind('autocompleteselect', {class_num: classNum, class_elem: class_elem},
 			function(event, ui)
+			    {
 				if (!ui.item)
 				    return;
 				if (ui.item.value.indexOf('-') != -1)
+				    {
 					jQuery.ajax(
+						    {
 							url: 'auto.php',
 							    data: {
     							        getsections: 1,
 								term: ui.item.value,
 								school: slate_permutate_school,
 								semester: slate_permutate_semester
 								},
 							    context: {'class_num': event.data.class_num},
 							    success: function(data, textStatus, reqobj)
+							    {
 								var new_course_num;
 								if (data.sections)
+								    {
 									add_sections(this.class_num, data);
 									new_course_num = add_class();
 									/* position the user's cursor the new class's input box */
 									jQuery('#input-course-' + new_course_num).focus();
+								    }
+							    }
+						    }
 						    );
 					course_autocomplete(event.data.class_num, ui.item.value);
+				    }
 				else
+				    {
 					/*
 					 * The user selected a department, such as CS or MATH.
 					 * Thus, we should append a '-' to the value and do a search for that.
 					 */
 					var newval = ui.item.value + '-';
 					event.data.class_elem.
 					    val(newval).
 					    autocomplete("search", newval);
@@ @@ -340,24 +334,103 @@ function add_class() @@
+{
     /*
      * Don't add an empty new course entry if there already is
      * one. Otherwise, set this new class to be the ``hot'' one.
      */
     if (slate_permutate_course_free == -1)
 	slate_permutate_course_free = add_class_n('', '');
     return slate_permutate_course_free;
+}
 /**
  * \brief
  *   Try to fetch a section once the user has chosen an autocomplete
  *   entry.
+ *
  * Since this can be called also when the user just types in a course
  * and hits enter without what he typed necessarily matching an
  * autocomplete item, this function handles the case where the
  * requested course might not have information on the server.
+ *
  * \param course_i
  *   The javascript/postData index of the course to autocomplete.
  * \param term
  *   The term which the user entered. Optional.
  * \return
  *   Nothing.
  */
 function course_autocomplete(course_i, term)
+{
     var course_name_elem = jQuery('.className' + course_i);
     /*
      * A safety mechanism: don't autocomplete a course if it already
      * has sections. Since this is AJAX, this same check must also
      * show up in the AJAX callback.
      */
     if (course_ajax_requests[course_i] || sectionsOfClass[course_i])
 	return;
     course_ajax_requests[course_i] = true;
     if (jQuery.type(term) == 'undefined')
 	term = course_name_elem.val();
     jQuery.ajax(
+	{
 	    url: 'auto.php',
 	    complete: function()
+	    {
 		/*
 		 * Not matter how the request goes -- if it fails or
 		 * returns nothing or whatnot -- the channel must be
 		 * opened up for more AJAX requests.
 		 */
 		course_ajax_requests[course_i] = false;
 	    },
 	    data: {
     		getsections: 1,
 		term: term,
 		school: slate_permutate_school,
 		semester: slate_permutate_semester
 	    },
 	    success: function(data, textStatus, reqobj)
+	    {
 		var new_course_num;
 		if (data.sections)
+		{
 		    if (sectionsOfClass[course_i])
 			return;
 		    add_sections(course_i, data);
 		    new_course_num = add_class();
 		    if (course_name_elem.val() != data.course_id)
 		    /* position the user's cursor the new class's input box */
 		    jQuery('#input-course-' + new_course_num).focus();
+		}
+	    }
+	}
     );
     return;
+}
 /**
  * \brief
  *   Remove a course entry.
+ *
  * Ensures that slate_permutate_course_free is kept consistent.
+ *
  * \param course_i
  *   The internal JS identifer for the course (not the course_id which
  *   the PHP cares about).
  */
 function course_remove(course_i)
+{
     jQuery('.class' + course_i).remove();
@@ @@ -597,17 +670,26 @@ jQuery(document).ready(function() { @@
         //-------------------------------------------------
         // Style course titles as inputs when clicked
         //-------------------------------------------------
         jQuery('.course-title-entry').live('click', function() {
           jQuery(this).toggleClass('inPlace');
         });
     /*
      * Prevent accidental form submission for className and course
      * title entry text fields.
      */
     jQuery('.course-title-entry').live('keyup keydown', slate_permutate_nullify_enter);
     jQuery('.className').live('keyup keydown', slate_permutate_nullify_enter);
     jQuery('.className').live('keyup keydown', function(e)
+			      {
 				  if (e.which == 13)
+				  {
 				      course_autocomplete(jQuery(this).parent().parent().data('course_i'));
 				      /* Prevent form submission like slate_permutate_nullify_enter() does. */
 				      return false;
+				  }
 			      });
         jQuery('.course-title-entry').live('blur', function() {
           jQuery(this).addClass('inPlace');
         });
 });

0 comments (0 inline, 0 general)