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

committing before merging local stash

Browse Source
This commit is contained in:
Jason White 2014-09-15 09:35:39 -04:00
parent 9bb1cb8d9c
commit b375cc091f
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/webapp/WEB-INF/pages/main_new.jsp
View File

@ -149,7 +149,8 @@
<span class="glyphicon-class glyphicon glyphicon-circle-arrow-left" id="showPrevHintBtn" ng-click="viewPrevHint()"></span> <span class="glyphicon-class glyphicon glyphicon-circle-arrow-left" id="showPrevHintBtn" ng-click="viewPrevHint()"></span>
<span class="glyphicon-class glyphicon glyphicon-circle-arrow-right" id="showNextHintBtn" ng-click="viewNextHint()"></span> <span class="glyphicon-class glyphicon glyphicon-circle-arrow-right" id="showNextHintBtn" ng-click="viewNextHint()"></span>
<br/> <br/>
{{curHint}}
<span id="curHintContainer"></span><!--{{curHint}}-->
</div> </div>
</div> </div>
</div> </div>

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

@ -6,7 +6,7 @@
/** Lesson Controller (includes menu stuff) /** Lesson Controller (includes menu stuff)
* prepares and updates menu topic items for the view * prepares and updates menu topic items for the view
*/ */
goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCache) { goat.controller('goatLesson', function($scope, $http, $modal, $log, $sce) { //$templateCache
$scope.cookies = []; $scope.cookies = [];
$scope.params = []; $scope.params = [];
//TODO: implement via separate promise and use config for menu (goat.data.loadMenuData()) //TODO: implement via separate promise and use config for menu (goat.data.loadMenuData())
@ -128,22 +128,32 @@ goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCac
$('.lessonHelp').hide(); $('.lessonHelp').hide();
$('#lesson_hint_row').show(); $('#lesson_hint_row').show();
goat.utils.scrollToHelp(); //goat.utils.scrollToHelp();
//TODO
$scope.curHint = $scope.hints[$scope.hintIndex].hint; $scope.curHint = $scope.hints[$scope.hintIndex].hint;
//$scope.curHint = $sce.trustAsHtml($scope.hints[$scope.hintIndex].hint);
//TODO get html binding workin in the UI ... in the meantime ...
$scope.renderCurHint();
$scope.manageHintButtons(); $scope.manageHintButtons();
}; };
$scope.viewNextHint = function() { $scope.viewNextHint = function() {
$scope.hintIndex++; $scope.hintIndex++;
$scope.curHint = $scope.hints[$scope.hintIndex].hint; $scope.curHint = $scope.hints[$scope.hintIndex].hint;
$scope.renderCurHint();
$scope.manageHintButtons(); $scope.manageHintButtons();
}; };
$scope.viewPrevHint = function() { $scope.viewPrevHint = function() {
$scope.hintIndex--; $scope.hintIndex--;
$scope.curHint = $scope.hints[$scope.hintIndex].hint; $scope.curHint = $scope.hints[$scope.hintIndex].hint;
$scope.renderCurHint();
$scope.manageHintButtons(); $scope.manageHintButtons();
}; };
$scope.renderCurHint = function() {
$('#curHintContainer').html($scope.curHint);
}
$scope.hideHints = function() { $scope.hideHints = function() {