Merge pull request WebGoat#153 from misfir3/master

WebGoat#133 hiding hint on change of lesson/loesson load

Author: nbaars

webgoat-container/src/main/webapp/js/goatApp/controller/LessonController.js

@@ -52,7 +52,6 @@ define(['jquery',
             };
 
             this.loadLesson = function(scr,menu,stage,num) {
-                console.log("Loading a lesson, scr: " + scr + ", menu: " + menu + ", stage: " + stage + ", num: " + num);
                 this.titleView = new TitleView();
                 this.helpsLoaded = {};
                 if (typeof(scr) == "undefined") {
@@ -85,7 +84,6 @@ define(['jquery',
             };
 
             this.onInfoLoaded = function() {
-                console.log("Lesson info loaded")
                 this.helpControlsView = new HelpControlsView({
                     hasPlan:this.lessonInfoModel.get('hasPlan'),
                     hasSolution:this.lessonInfoModel.get('hasSolution'),
@@ -105,7 +103,6 @@ define(['jquery',
             };
 
             this.onContentLoaded = function(loadHelps) {
-                console.log("Lesson content loaded")
                 this.lessonInfoModel = new LessonInfoModel();
                 this.listenTo(this.lessonInfoModel,'info:loaded',this.onInfoLoaded);
 

webgoat-container/src/main/webapp/js/goatApp/support/GoatUtils.js

@@ -12,6 +12,7 @@ define(['jquery',
                     //var id =
                     return  lessonName.replace(/\s|\(|\)|\!|\:|\;|\@|\#|\$|\%|\^|\&|\*/g, '');
                 },
+                
                 addMenuClasses: function(arr) {
                     for (var i = 0; i < arr.length; i++) {
                         var menuItem = arr[i];
@@ -46,7 +47,8 @@ define(['jquery',
                         if (show) {
                             $('#' + id).show();
                         } else {
-a                        }
+
+                        }
                     }
                 },
 

webgoat-container/src/main/webapp/js/goatApp/view/GoatRouter.js

@@ -40,13 +40,12 @@ define(['jquery',
             goatRouter.on('route:attackRoute', function(scr,menu,stage,num) {
                 this.lessonController.loadLesson(scr,menu,stage,num);
                 this.menuController.updateMenu(scr,menu);
-                //update menu
             });
             goatRouter.on('route:welcomeRoute', function() {
                 this.lessonController.loadWelcome();
             });
             goatRouter.on("route", function(route, params) {
-                console.log("Got a route event: " + route + ", params: " + params);
+
             });
 
             Backbone.history.start();

webgoat-container/src/main/webapp/js/goatApp/view/HintView.js

@@ -16,7 +16,7 @@ function($,
 			this.curHint=0;
 			this.collection = new HintCollection();
 			this.listenTo(this.collection,'loaded',this.onModelLoaded);
-			
+			this.hideHints();
 		},
 
 		render:function() {
@@ -37,6 +37,12 @@ function($,
 			this.trigger('hints:loaded',{'helpElement':'hints','value':true})
 		},
 
+		hideHints: function() {
+			if (this.$el.is(':visible')) {
+				this.$el.hide(350);
+			}
+		},			
+
 		showNextHint: function() {
 			this.curHint = (this.curHint < this.collection.length -1) ? this.curHint+1 : this.curHint;
 			this.hideShowPrevNextButtons();

webgoat-container/src/main/webapp/js/goatApp/view/MenuView.js

@@ -50,7 +50,6 @@ define(['jquery',
 
 				catLink.append(catArrow);
 				catLink.append(catLinkText);
-				//TODO: refactor this along with sub-views/components
 				var self = this;
 				catLink.click(_.bind(this.expandCategory,this,catId));
 				category.append(catLink);
@@ -62,12 +61,12 @@ define(['jquery',
 					for (var j=0; j < lessons.length;j++) {
 						var lessonItem = $('<li>',{class:'lesson'});
 						var lessonName = lessons[j].name;
-						var lessonId = GoatUtils.makeId(lessonName);
+						var lessonId = catId + '-' + GoatUtils.makeId(lessonName);
 						if (this.curLessonLinkId === lessonId) {
 							lessonItem.addClass('selected');
 						}
 						var lessonLink = $('<a>',{href:lessons[j].link,text:lessonName,id:lessonId});
-						lessonLink.click(_.bind(this.onLessonClick,this,lessonName));
+						lessonLink.click(_.bind(this.onLessonClick,this,lessonId));
 						lessonItem.append(lessonLink);
 						//check for lab/stages
 						categoryLessonList.append(lessonItem);
@@ -78,12 +77,12 @@ define(['jquery',
 						for (k=0; k < stages.length; k++) {
 							var stageItem = $('<li>',{class:'stage'});
 							var stageName = stages[k].name;
-							var stageId = GoatUtils.makeId(stageName);
+							var stageId = lessonId +  '-stage' + k;
 							if (this.curLessonLinkId === stageId) {
 								stageItem.addClass('selected');
 							}
 							var stageLink = $('<a>',{href:stages[k].link,text:stageName,id:stageId});
-							stageLink.click(_.bind(this.onLessonClick,this,stageName));
+							stageLink.click(_.bind(this.onLessonClick,this,stageId));
 							stageItem.append(stageLink);
 							categoryLessonList.append(stageItem);
 							if (stages[k].complete) {
@@ -108,14 +107,11 @@ define(['jquery',
 			this.collection.fetch();
 		},
 
-		onLessonClick: function (title) {
-			var oldLinkId = GoatUtils.makeId(this.curLessonLinkId);
-			$('#'+oldLinkId).removeClass('selected');
+		onLessonClick: function (elementId) {
+			$('#'+this.curLessonLinkId).removeClass('selected');
 			//update
-			this.curLessonLinkId = GoatUtils.makeId(title);
-			var newLinkId = GoatUtils.makeId(this.curLessonLinkId)
-			$('#'+newLinkId).addClass('selected');
-			this.trigger('lesson:click', title); // will cause menu reload
+			$('#'+elementId).addClass('selected');
+			this.curLessonLinkId = elementId;
 		},
 
 		expandCategory: function (id) {