Refactoring loadLesson to loadLessonIfChanged and smaller loadLesson

fhinkel · fhinkel · commit ead24efd2c55 · 2016-04-18T21:37:13.000-04:00
diff --git a/src/frontend/accordion.js b/src/frontend/accordion.js
@@ -42,17 +42,20 @@ var scrollDownUntilTutorialVisible = function() {
 
 var appendTutorialToAccordion = function(tmptitle, lessons, index) {
   var title = tmptitle.clone();
-  title.wrapInner("<a href='#' class='" + cssClasses.titleHref + "' tutorialid=" + index + "/>")
+  title.wrapInner("<a href='#' class='" + cssClasses.titleHref +
+      "' tutorialid=" + index + "/>")
       .addClass(cssClasses.title)
       .prepend(
-          '<i class="' + cssClasses.titleSymbolClass + '">' + cssClasses.titleSymbolActive + '</i>')
+          '<i class="' + cssClasses.titleSymbolClass + '">' +
+          cssClasses.titleSymbolActive + '</i>')
       .hover(function() {
         $(this).toggleClass(cssClasses.titleHover);
       })
       .click(function() {
         $(this).toggleClass(cssClasses.titleToggleClass)
             .find("> .titleSymbol").toggleText(
-            cssClasses.titleSymbolActive + " " + cssClasses.titleSymbolInactive).end()
+            cssClasses.titleSymbolActive + " " +
+            cssClasses.titleSymbolInactive).end()
             .next().slideToggle(scrollDownUntilTutorialVisible);
         return false;
       })
@@ -61,7 +64,8 @@ var appendTutorialToAccordion = function(tmptitle, lessons, index) {
   var content = '<ul>';
   for (var j = 0; j < lessons.length; j++) {
     content = content +
-        '<li class="' + cssClasses.innerListItem + '"><a href="#" class="' + cssClasses.submenuHref + '" tutorialid=' + index +
+        '<li class="' + cssClasses.innerListItem + '"><a href="#" class="' +
+        cssClasses.submenuHref + '" tutorialid=' + index +
         ' lessonid=' + j + '>  ' + lessons[j].title + '</a></li>';
   }
   content += '</ul>';
@@ -108,7 +112,8 @@ var addExpandLoadTutorialInstructionsButton = function() {
   expandButton.click(function() {
     var title = $("#loadTutorialMenu");
     var instructions = $("#loadTutorialInstructions");
-    expandButton.toggleText(cssClasses.titleSymbolInactive + " " + cssClasses.titleSymbolActive);
+    expandButton.toggleText(cssClasses.titleSymbolInactive + " " +
+        cssClasses.titleSymbolActive);
     title.toggleClass(
         cssClasses.titleToggleClass);
     instructions.slideToggle(scrollDownUntilTutorialVisible);
diff --git a/src/frontend/fetchTutorials.js b/src/frontend/fetchTutorials.js
@@ -10,7 +10,7 @@ module.exports = function(callback) {
         console.log("Obtaining list of tutorials successful: " + tutorialPaths);
         callback(0, tutorialPaths);
       }).catch(function(error) {
-    console.log("There was an error obtaining the list of " +
+        console.log("There was an error obtaining the list of " +
         "tutorial files: " + error);
-  });
+      });
 };
diff --git a/src/frontend/tutorials.js b/src/frontend/tutorials.js
@@ -10,11 +10,6 @@ var firstLoadFlag = true; // true until we show tutorial for the first time. Nee
 var accordion = require('./accordion')();
 
 var loadLesson = function(tutorialid, lessonid) {
-  console.log(tutorialNr + "==" + tutorialid + " or " + lessonNr + "==" +
-      lessonid);
-  var changedLesson = (tutorialNr !== tutorialid || lessonNr !==
-  lessonid || firstLoadFlag);
-  firstLoadFlag = false;
   if (tutorialid >= 0 && tutorialid < tutorials.length) {
     tutorialNr = tutorialid;
   }
@@ -23,11 +18,20 @@ var loadLesson = function(tutorialid, lessonid) {
   }
   var lessonContent = tutorials[tutorialNr].lessons[lessonNr]
       .html;
+  var title = tutorials[tutorialNr].title.text();
+  $("#lesson").html(lessonContent).prepend("<h3>" + title + "</h3>");
+  $("#lesson").scrollTop(0); // scroll to the top of a new lesson
+  MathJax.Hub.Queue(["Typeset", MathJax.Hub, "#lesson"]);
+};
+
+var loadLessonIfChanged = function(tutorialid, lessonid) {
+  console.log(tutorialNr + "==" + tutorialid + " or " + lessonNr + "==" +
+      lessonid);
+  var changedLesson = (tutorialNr !== tutorialid || lessonNr !==
+  lessonid || firstLoadFlag);
+  firstLoadFlag = false;
   if (changedLesson) {
-    var title = tutorials[tutorialNr].title.text();
-    $("#lesson").html(lessonContent).prepend("<h3>" + title + "</h3>");
-    $("#lesson").scrollTop(0); // scroll to the top of a new lesson
-    MathJax.Hub.Queue(["Typeset", MathJax.Hub, "#lesson"]);
+    loadLesson(tutorialid, lessonid);
   }
 };
 
@@ -44,14 +48,14 @@ var showLesson = function(e) {
     lessonId = $(this).attr('lessonid');
     lessonIdNr = parseInt(lessonId.match(/\d/g), 10);
   }
-  loadLesson(tutorialIdNr, lessonIdNr);
+  loadLessonIfChanged(tutorialIdNr, lessonIdNr);
   document.getElementById("lessonTabTitle").click();
   return false;
 };
 
 var switchLesson = function(incr) {
   // console.log("Current lessonNr " + lessonNr);
-  loadLesson(tutorialNr, lessonNr + incr);
+  loadLessonIfChanged(tutorialNr, lessonNr + incr);
 };
 
 var populateTutorialElement = function(theHtml) {
@@ -80,7 +84,7 @@ var makeTutorialsList = function(i, tutorialNames) {
   } else {
     accordion.makeAccordion(tutorials);
     $(".menuTitle").on("click", {lessonIdNr: "0"}, showLesson);
-    loadLesson(tutorialNr, lessonNr);
+    loadLessonIfChanged(tutorialNr, lessonNr);
   }
 };
 
