From 648bd3bb9559587b187a6ccae25e9069b2198624 Mon Sep 17 00:00:00 2001 From: Jason White Date: Thu, 22 Oct 2015 16:55:18 -0500 Subject: [PATCH 1/2] code cleanup --- .../src/main/java/org/owasp/webgoat/session/Course.java | 1 - 1 file changed, 1 deletion(-) diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java index ff63c53ca..3a41fcded 100644 --- a/webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java +++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java @@ -205,7 +205,6 @@ public class Course { while (iter.hasNext()) { AbstractLesson lesson = iter.next(); - // System.out.println("getLesson() at role: " + lesson.getRole()); if (lesson.getScreenId() == lessonId && roles.contains(lesson.getRole())) { return lesson; } From 3c1336a033ff5d4af907dbd82506b362e4e509f9 Mon Sep 17 00:00:00 2001 From: Jason White Date: Fri, 23 Oct 2015 15:15:57 -0500 Subject: [PATCH 2/2] #41: spinner implemented for menu loading --- .../src/main/webapp/js/goatApp/view/MenuView.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/webgoat-container/src/main/webapp/js/goatApp/view/MenuView.js b/webgoat-container/src/main/webapp/js/goatApp/view/MenuView.js index ab721d98a..f9ecf1177 100644 --- a/webgoat-container/src/main/webapp/js/goatApp/view/MenuView.js +++ b/webgoat-container/src/main/webapp/js/goatApp/view/MenuView.js @@ -16,14 +16,26 @@ define(['jquery', //TODO: set template initialize: function() { this.collection = new MenuCollection(); + this.addSpinner(); this.listenTo(this.collection,'menuData:loaded',this.render); // this.listenTo(this,'menu:click',this.accordionMenu); this.curLessonLinkId = ''; }, + + addSpinner: function() { + // + this.$el.append($('',{class:'fa fa-3x fa-spinner fa-spin'})); + }, + + removeSpinner: function() { + this.$el.find('i.fa-spinner').remove(); + }, + // rendering top level menu render: function (){ //for now, just brute force //TODO: refactor into sub-views/components + this.removeSpinner(); var items, catItems, stages; items = this.collection.models; // top level items var menuMarkup = '';