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

code cleanup

Browse Source
This commit is contained in:
Jason White 2015-10-24 13:15:14 -05:00
parent fc2360b49b
commit ab29afec3c
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,19 +88,18 @@ define(['jquery',
this.onContentLoaded = function(loadHelps) { this.onContentLoaded = function(loadHelps) {
this.lessonInfoModel = new LessonInfoModel(); this.lessonInfoModel = new LessonInfoModel();
this.listenTo(this.lessonInfoModel,'info:loaded',this.onInfoLoaded); //TODO onInfoLoaded function to handle title view and helpview this.listenTo(this.lessonInfoModel,'info:loaded',this.onInfoLoaded);
if (loadHelps) { if (loadHelps) {
this.helpControlsView = null; this.helpControlsView = null;
this.lessonView.model = this.lessonContent; this.lessonView.model = this.lessonContent;
this.lessonView.render(); this.lessonView.render();
//load title view (initially hidden) << //TODO: currently handled via menu click but need to be able to handle via routed request
this.planView = new PlanView(); this.planView = new PlanView();
this.solutionView = new SolutionView(); this.solutionView = new SolutionView();
this.sourceView = new SourceView(); this.sourceView = new SourceView();
this.lessonHintView = new HintView(); this.lessonHintView = new HintView();
this.cookieView = new CookieView(); this.cookieView = new CookieView();
// parameter model & view
//TODO: instantiate model with values (not sure why was not working before) //TODO: instantiate model with values (not sure why was not working before)
var paramModel = new ParamModel({}); var paramModel = new ParamModel({});
paramModel.set('screenParam',this.lessonContent.get('screenParam')); paramModel.set('screenParam',this.lessonContent.get('screenParam'));

3
webgoat-container/src/main/webapp/js/goatApp/model/LessonInfoModel.js
View File

@ -13,9 +13,8 @@ define(['jquery',
}, },
infoLoaded: function(data) { infoLoaded: function(data) {
console.log (data);
this.trigger('info:loaded',this,data); this.trigger('info:loaded',this,data);
} }
}); });
}); });6

3
webgoat-container/src/main/webapp/js/goatApp/view/LessonContentView.js
View File

@ -10,15 +10,18 @@ define(['jquery',
JQueryForm) { JQueryForm) {
return Backbone.View.extend({ return Backbone.View.extend({
el:'#lesson-content-wrapper', //TODO << get this fixed up in DOM el:'#lesson-content-wrapper', //TODO << get this fixed up in DOM
initialize: function(options) { initialize: function(options) {
options = options || {}; options = options || {};
}, },
render: function() { render: function() {
this.$el.html(this.model.get('content')); this.$el.html(this.model.get('content'));
this.makeFormsAjax(); this.makeFormsAjax();
this.ajaxifyAttackHref(); this.ajaxifyAttackHref();
$(window).scrollTop(0); //work-around til we get the scroll down sorted out $(window).scrollTop(0); //work-around til we get the scroll down sorted out
}, },
//TODO: reimplement this in custom fashion maybe? //TODO: reimplement this in custom fashion maybe?
makeFormsAjax: function () { makeFormsAjax: function () {
var options = { var options = {

1
webgoat-container/src/main/webapp/js/goatApp/view/TitleView.js
View File

@ -4,6 +4,7 @@ define(['jquery',
function($,_,Backbone) { function($,_,Backbone) {
return Backbone.View.extend({ return Backbone.View.extend({
el:'#header #lesson-title-wrapper', el:'#header #lesson-title-wrapper',
render:function(title) { render:function(title) {
var lessonTitleEl = $('<h1>',{id:'lesson-title',text:title}); var lessonTitleEl = $('<h1>',{id:'lesson-title',text:title});
this.$el.html(lessonTitleEl); this.$el.html(lessonTitleEl);