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

rounded out work on restart lesson and finished implementing showSource/showHints through UI, now that they come as metadata for a lesson

Browse Source
This commit is contained in:
Jason White
2014-09-20 21:35:16 -04:00
parent 4ff73d0215
commit 867b692f52
3 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/js/goatConstants.js
View File

@ -24,9 +24,11 @@ var goatConstants = {
menuService: 'service/lessonmenu.mvc',
lessonTitleService: 'service/lessontitle.mvc',
restartLessonService: 'service/restartlesson.mvc',
// literals
// literal messages
notFound: 'Could not find',
noHints: 'There are no hints defined.'
noHints: 'There are no hints defined.',
noSourcePulled: 'No source was retrieved for this lesson'
};

42
src/main/webapp/js/goatControllers.js
View File

@ -64,9 +64,7 @@ var goatMenu = function($scope, $http, $modal, $log, $templateCache) {
);
};
$scope.renderLesson = function(id,url) {
//console.log(url + ' was passed in');
// use jquery to render lesson content to div
$scope.renderLesson = function(id,url,showControls) {//TODO convert to single object parameter
$scope.hintIndex = 0;
var curScope = $scope;
$('.lessonHelp').hide();
@ -89,7 +87,7 @@ var goatMenu = function($scope, $http, $modal, $log, $templateCache) {
goat.utils.ajaxifyAttackHref();
$('#leftside-navigation').height($('#main-content').height()+15)//TODO: get ride of fixed value (15)here
//notifies goatLesson Controller of the less change
$scope.$emit('lessonUpdate',{params:curScope.parameters});
$scope.$emit('lessonUpdate',{params:curScope.parameters,'showControls':showControls});
}
)
$scope.renderMenu();
@ -123,6 +121,8 @@ var goatLesson = function($scope,$http,$log) {
$scope.$on('lessonUpdate',function(params){
$scope.parameters = arguments[1].params;
$scope.showHints = (arguments[1].showControls && arguments[1].showControls.showHints);
$scope.showSource = (arguments[1].showControls && arguments[1].showControls.showSource);
curScope = $scope; //TODO .. update below, this curScope is probably not needed
goat.data.loadCookies($http).then(
function(resp) {
@ -131,22 +131,32 @@ var goatLesson = function($scope,$http,$log) {
);
//hints
curScope.hintIndex = 0;
goat.data.loadHints($http).then(
function(resp) {
curScope.hints = resp.data;
if (curScope.hints.length > 0 && curScope.hints[0].hint.indexOf(goatConstants.noHints) === -1) {
goat.utils.displayButton('showHintsBtn', true);
} else {
goat.utils.displayButton('showHintsBtn', false);
if ($scope.showHints) {
goat.data.loadHints($http).then(
function(resp) {
curScope.hints = resp.data;
if (curScope.hints.length > 0 && curScope.hints[0].hint.indexOf(goatConstants.noHints) === -1) {
goat.utils.displayButton('showHintsBtn', true);
} else {
goat.utils.displayButton('showHintsBtn', false);
}
}
}
);
);
} else {
$scope.hints = null;
goat.utils.displayButton('showHintsBtn', false);
}
//source
goat.data.loadSource($http).then(
if ($scope.showSource) {
goat.data.loadSource($http).then(
function(resp) {
curScope.source = resp.data;
}
);
);
} else {
$scope.source = goatConstants.noSourcePulled;
}
//plan
goat.data.loadPlan($http).then(
function(resp) {
@ -239,7 +249,7 @@ var goatLesson = function($scope,$http,$log) {
$scope.restartLesson = function () {
goat.data.loadRestart($http).then(
function(resp) {
angular.element($('#leftside-navigation')).scope().renderLesson(null,resp.data);
angular.element($('#leftside-navigation')).scope().renderLesson(null,resp.data,{showSource:$scope.showSource,showHints:$scope.showHints});
}
)
}