Skip to content

Commit bcf7c9a

Browse files
author
Jason White
committed
fix for some lessons that were not loading correctly ... fixes special characters that were getting rendering into id's
1 parent 13a95c3 commit bcf7c9a

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/main/webapp/js/goatControllers.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ var goatMenu = function($scope, $http, $modal, $log, $templateCache) {
1313
var menuItems = goat.utils.addMenuClasses(goatConstants.menuPrefix.concat(menuData.data));
1414
//top-tier 'categories'
1515
for (var i=0;i<menuItems.length;i++) {
16-
menuItems[i].id = menuItems[i].name.replace(/\s|\(|\)/g,'');//TODO move the replace routine into util function
16+
menuItems[i].id = goat.utils.makeId(menuItems[i].name);//TODO move the replace routine into util function
1717
menuItems[i].displayClass= ($scope.openMenu === menuItems[i].id) ? goatConstants.keepOpenClass : '';
1818
if (menuItems[i].children) {
1919
for (var j=0;j<menuItems[i].children.length;j++){
20-
menuItems[i].children[j].id = menuItems[i].children[j].name.replace(/\s|\(|\)/g,'');
20+
menuItems[i].children[j].id = goat.utils.makeId(menuItems[i].children[j].name);
2121
//handle selected Menu state
2222
if (menuItems[i].children[j].id === $scope.curMenuItemSelected) {
2323
menuItems[i].children[j].selectedClass = goatConstants.selectedMenuClass;
@@ -32,7 +32,8 @@ var goatMenu = function($scope, $http, $modal, $log, $templateCache) {
3232
if (menuItems[i].children[j].children) {
3333
for (var k=0;k < menuItems[i].children[j].children.length;k++) {
3434
//TODO make utility function for name >> id
35-
menuItems[i].children[j].children[k].id = menuItems[i].children[j].children[k].name.replace(/\s|\(|\)/g,'');
35+
menuItems[i].children[j].children[k].id = goat.utils.makeId(menuItems[i].children[j].children[k].name);
36+
//menuItems[i].children[j].children[k].id = menuItems[i].children[j].children[k].name.replace(/\s|\(|\)/g,'');
3637
//handle selected Menu state
3738
if (menuItems[i].children[j].children[k].id === $scope.curMenuItemSelected) {
3839
menuItems[i].children[j].children[k].selectedClass = goatConstants.selectedMenuClass;

src/main/webapp/js/goatUtil.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ goat.utils = {
8787
$('ul li.selected a.selected').removeClass(goatConstants.selectedMenuClass)
8888
$('#'+id).addClass(goatConstants.selectedMenuClass);
8989
$('#'+id).parent().addClass(goatConstants.selectedMenuClass);
90+
},
91+
makeId: function (lessonName) {
92+
return lessonName.replace(/\s|\(|\)|\!|\:|\;|\@|\#|\$|\%|\^|\&|\*/g,'');//TODO move the replace routine into util function
9093
}
9194
};
9295

0 commit comments

Comments
 (0)