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

Merge pull request #21 from misfir3/master

Browse Source 
initial cut of paramView re-enabled
This commit is contained in:
misfir3
2015-08-19 08:38:44 -04:00
parent ef9a30b72a 1d70da301e
commit 7c12ac4c9b
5 changed files with 82 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,8 @@ define(['jquery',
'goatApp/view/LessonHintView',
'goatApp/view/HelpControlsView',
'goatApp/view/CookieView',
'goatApp/view/ParamView',
'goatApp/model/ParamModel',
'goatApp/support/GoatUtils'
],
function($,
@ -22,6 +24,8 @@ define(['jquery',
LessonHintView,
HelpControlsView,
CookieView,
ParamView,
ParamModel,
GoatUtils
) {
'use strict'
@ -38,7 +42,7 @@ define(['jquery',
_.extend(Controller.prototype,Backbone.Events);
this.start = function() {
this.listenTo(this.lessonContent,'contentLoaded',this.onContentLoaded);
this.listenToOnce(this.lessonContent,'contentLoaded',this.onContentLoaded);
};
//load View, which can pull data
@ -52,7 +56,7 @@ define(['jquery',
this.solutionView = {};
this.sourceView = {};
this.lessonHintView = {};
this.screen = scr;
this.screen = scr; //needed anymore?
this.menu = menu;
//
@ -62,9 +66,6 @@ define(['jquery',
this.helpControlsView = null;
this.lessonView.model = this.lessonContent;
this.lessonView.render();
//load cookies/parameters view
//load title view (initially hidden) << //TODO: currently handled via menu click but need to be able to handle via routed request
//plan view (initially hidden)
this.planView = new PlanView();
@ -80,6 +81,13 @@ define(['jquery',
this.listenToOnce(this.lessonHintView,'hints:loaded',this.areHelpsReady);
//
this.cookieView = new CookieView();
// parameter model & view
//TODO: instantiate model with values at once (not sure why was not working before)
var paramModel = new ParamModel({
});
paramModel.set('screenParam',this.lessonContent.get('screenParam'));
paramModel.set('menuParam',this.lessonContent.get('screenParam'));
this.paramView = new ParamView({model:paramModel});
this.hideShowHelps(null);
};