From 0628a27b34ceeb41a695ac6681ce941901f886e2 Mon Sep 17 00:00:00 2001 From: Jason White Date: Wed, 2 Dec 2015 15:06:10 -0500 Subject: [PATCH] clean up --- .../src/main/webapp/js/goatApp/controller/LessonController.js | 3 --- .../src/main/webapp/js/goatApp/support/GoatUtils.js | 4 +++- .../src/main/webapp/js/goatApp/view/GoatRouter.js | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/webgoat-container/src/main/webapp/js/goatApp/controller/LessonController.js b/webgoat-container/src/main/webapp/js/goatApp/controller/LessonController.js index e26d7bc0e..43964bbe4 100644 --- a/webgoat-container/src/main/webapp/js/goatApp/controller/LessonController.js +++ b/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); diff --git a/webgoat-container/src/main/webapp/js/goatApp/support/GoatUtils.js b/webgoat-container/src/main/webapp/js/goatApp/support/GoatUtils.js index a41586a53..f5bad1c6d 100644 --- a/webgoat-container/src/main/webapp/js/goatApp/support/GoatUtils.js +++ b/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 } + + } } }, diff --git a/webgoat-container/src/main/webapp/js/goatApp/view/GoatRouter.js b/webgoat-container/src/main/webapp/js/goatApp/view/GoatRouter.js index b95167123..2c6cb502a 100644 --- a/webgoat-container/src/main/webapp/js/goatApp/view/GoatRouter.js +++ b/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();