sugar

~dev_rating/media/js/discipline/general.js

@@ -11,21 +11,22 @@ $(function() {
 	function GetSubjectsList()
 	{
 		var FacultyID = 0;
-		if (parseInt($('.SelectFaculty option:selected').val()) > 0)
-		{
-			var FacultyID = $('.SelectFaculty option:selected').val(); 
-			$.post(
-				URLdir + 'handler/map/GetSubjectsList',
-				{
-					'FacultyID': FacultyID
-				},
-				function(data)
-				{
-					SubjectsGlobal = $.parseJSON(data);
-					console.log(SubjectsGlobal); // *
-				}
-			);
-		}
+		var optionVal = parseInt($('.SelectFaculty option:selected').val());
+		if (optionVal <= 0)
+			return;
+		
+		var FacultyID = optionVal; 
+		$.post(
+			URLdir + 'handler/map/GetSubjectsList',
+			{
+				'FacultyID': FacultyID
+			},
+			function(data)
+			{
+				SubjectsGlobal = $.parseJSON(data);
+				console.log(SubjectsGlobal); // *
+			}
+		);
 	}
 	GetSubjectsList();
 	
@@ -35,15 +36,16 @@ $(function() {
 		var NameFilter = NameFilter.toLowerCase();
 		var SortSubjects = {};
 		var j = 0;
-		var SubjectCount = parseInt(SubjectsGlobal.Count);
-		for (var i = SubjectCount - 1; i >= 0; i--)
+		var SubjectCount = SubjectsGlobal.Count;
+		for (var i = SubjectCount - 1; i >= 0; --i)
 		{
-			if ((SubjectsGlobal[i].Title).toLowerCase().indexOf(NameFilter) == 0)
+			src = SubjectsGlobal[i];
+			if ((src.Title).toLowerCase().indexOf(NameFilter) == 0)
 			{
 				// 0 - успех, -1 - ничего не нашел 
-				SortSubjects[j] = {};
-				SortSubjects[j]['ID'] = SubjectsGlobal[i].ID;
-				SortSubjects[j]['Title'] = SubjectsGlobal[i].Title;
+				var dest = SortSubjects[j] = {};
+				dest['ID'] = src.ID;
+				dest['Title'] = src.Title;
 				j++;
 			}
 		}
@@ -57,40 +59,46 @@ $(function() {
 	$('.InputSubject').keyup(function()
 	{
 		var NameFilter = $(this).val();
-		if (NameFilter.length > 0)
-		{
-			var SortSubjects = SortByName(NameFilter);
-			var SelectSubject = $('.SelectSubject');
+
+		if (NameFilter.length <= 0) {
 			SelectSubject.html('');
-			if (SortSubjects.Count > 0) {
-				SelectSubject.append('<option disabled>Результаты:</option>');
-				for (var i = SortSubjects.Count - 1; i >= 0; i--)
-					SelectSubject.append('<option value="'+ SortSubjects[i].ID +'">'+ SortSubjects[i].Title +'</option>');
-					
-				if (SortSubjects.Count > 4)
-					SelectSubject.attr('size', '4');
-				else
-					SelectSubject.attr('size', '2');
-			}
-			else {
-				SelectSubject.append('<option disabled>По запросу ничего не найдено.</option>');
-				SelectSubject.attr('size', '2');
-			}
-			SelectSubject.show();
+			return;
+		}
+
+		var SortSubjects = SortByName(NameFilter);
+		var SelectSubject = $('.SelectSubject');
+		SelectSubject.html('');
+		if (SortSubjects.Count > 0) {
+			SelectSubject.append('<option disabled>Результаты:</option>');
+			for (var i = SortSubjects.Count - 1; i >= 0; --i)
+				SelectSubject.append('<option value="'+ SortSubjects[i].ID +'">'+ SortSubjects[i].Title +'</option>');
+				
+			var size = (SortSubjects.Count > 4)?'4':'2';
+			SelectSubject.attr('size', size);
 		}
 		else {
-			SelectSubject.html('');
+			SelectSubject.append('<option disabled>По запросу ничего не найдено.</option>');
+			SelectSubject.attr('size', '2');
 		}
+		SelectSubject.show();
+
 	});
 	
+
+
 	$('.SelectFaculty').change(function(){
 		GetSubjectsList($(this).val());
 	});
 	
+
+
 	$('.SelectSubject').change(function(){
 		$('.InputSubject').val($('.SelectSubject option:selected').text());
 		$(this).hide();
 	});
+
+
+
 	$('.InputSubject').focusout(function(){
 		var SelectSubject = $('.SelectSubject');
 		var NameFilter = $(this).val();