dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #119 from misfir3/master

Browse Source 
Code cleanup and menu spinner
This commit is contained in:
Doug Morato 2015-10-24 13:49:33 -04:00
commit d7ef02b06a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java
View File

@ -205,7 +205,6 @@ public class Course {
while (iter.hasNext()) { while (iter.hasNext()) {
AbstractLesson lesson = iter.next(); AbstractLesson lesson = iter.next();
// System.out.println("getLesson() at role: " + lesson.getRole());
if (lesson.getScreenId() == lessonId && roles.contains(lesson.getRole())) { if (lesson.getScreenId() == lessonId && roles.contains(lesson.getRole())) {
return lesson; return lesson;
} }

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

@ -16,14 +16,26 @@ define(['jquery',
//TODO: set template //TODO: set template
initialize: function() { initialize: function() {
this.collection = new MenuCollection(); this.collection = new MenuCollection();
this.addSpinner();
this.listenTo(this.collection,'menuData:loaded',this.render); this.listenTo(this.collection,'menuData:loaded',this.render);
// this.listenTo(this,'menu:click',this.accordionMenu); // this.listenTo(this,'menu:click',this.accordionMenu);
this.curLessonLinkId = ''; this.curLessonLinkId = '';
}, },
addSpinner: function() {
//<i class="fa fa-spinner fa-spin"></i>
this.$el.append($('<i>',{class:'fa fa-3x fa-spinner fa-spin'}));
},
removeSpinner: function() {
this.$el.find('i.fa-spinner').remove();
},
// rendering top level menu // rendering top level menu
render: function (){ render: function (){
//for now, just brute force //for now, just brute force
//TODO: refactor into sub-views/components //TODO: refactor into sub-views/components
this.removeSpinner();
var items, catItems, stages; var items, catItems, stages;
items = this.collection.models; // top level items items = this.collection.models; // top level items
var menuMarkup = ''; var menuMarkup = '';