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

fix for some lessons that were not loading correctly ... fixes special characters that were getting rendering into id's

Browse Source
This commit is contained in:
Jason White 2014-09-19 11:33:05 -06:00
parent 13a95c3b24
commit bcf7c9a159
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,11 +13,11 @@ var goatMenu = function($scope, $http, $modal, $log, $templateCache) {
var menuItems = goat.utils.addMenuClasses(goatConstants.menuPrefix.concat(menuData.data)); var menuItems = goat.utils.addMenuClasses(goatConstants.menuPrefix.concat(menuData.data));
//top-tier 'categories' //top-tier 'categories'
for (var i=0;i<menuItems.length;i++) { for (var i=0;i<menuItems.length;i++) {
menuItems[i].id = menuItems[i].name.replace(/\s|\(|\)/g,'');//TODO move the replace routine into util function menuItems[i].id = goat.utils.makeId(menuItems[i].name);//TODO move the replace routine into util function
menuItems[i].displayClass= ($scope.openMenu === menuItems[i].id) ? goatConstants.keepOpenClass : ''; menuItems[i].displayClass= ($scope.openMenu === menuItems[i].id) ? goatConstants.keepOpenClass : '';
if (menuItems[i].children) { if (menuItems[i].children) {
for (var j=0;j<menuItems[i].children.length;j++){ for (var j=0;j<menuItems[i].children.length;j++){
menuItems[i].children[j].id = menuItems[i].children[j].name.replace(/\s|\(|\)/g,''); menuItems[i].children[j].id = goat.utils.makeId(menuItems[i].children[j].name);
//handle selected Menu state //handle selected Menu state
if (menuItems[i].children[j].id === $scope.curMenuItemSelected) { if (menuItems[i].children[j].id === $scope.curMenuItemSelected) {
menuItems[i].children[j].selectedClass = goatConstants.selectedMenuClass; menuItems[i].children[j].selectedClass = goatConstants.selectedMenuClass;
@ -32,7 +32,8 @@ var goatMenu = function($scope, $http, $modal, $log, $templateCache) {
if (menuItems[i].children[j].children) { if (menuItems[i].children[j].children) {
for (var k=0;k < menuItems[i].children[j].children.length;k++) { for (var k=0;k < menuItems[i].children[j].children.length;k++) {
//TODO make utility function for name >> id //TODO make utility function for name >> id
menuItems[i].children[j].children[k].id = menuItems[i].children[j].children[k].name.replace(/\s|\(|\)/g,''); menuItems[i].children[j].children[k].id = goat.utils.makeId(menuItems[i].children[j].children[k].name);
//menuItems[i].children[j].children[k].id = menuItems[i].children[j].children[k].name.replace(/\s|\(|\)/g,'');
//handle selected Menu state //handle selected Menu state
if (menuItems[i].children[j].children[k].id === $scope.curMenuItemSelected) { if (menuItems[i].children[j].children[k].id === $scope.curMenuItemSelected) {
menuItems[i].children[j].children[k].selectedClass = goatConstants.selectedMenuClass; menuItems[i].children[j].children[k].selectedClass = goatConstants.selectedMenuClass;

3
src/main/webapp/js/goatUtil.js
View File

@ -87,6 +87,9 @@ goat.utils = {
$('ul li.selected a.selected').removeClass(goatConstants.selectedMenuClass) $('ul li.selected a.selected').removeClass(goatConstants.selectedMenuClass)
$('#'+id).addClass(goatConstants.selectedMenuClass); $('#'+id).addClass(goatConstants.selectedMenuClass);
$('#'+id).parent().addClass(goatConstants.selectedMenuClass); $('#'+id).parent().addClass(goatConstants.selectedMenuClass);
},
makeId: function (lessonName) {
return lessonName.replace(/\s|\(|\)|\!|\:|\;|\@|\#|\$|\%|\^|\&|\*/g,'');//TODO move the replace routine into util function
} }
}; };