Merge remote-tracking branch 'upstream/master'

2015-08-19 05:34:39 -04:00
parent 1d70da301e ef9a30b72a
commit a36697bf0d
12 changed files with 3 additions and 1296 deletions
--- a/webgoat-container/src/main/webapp/js/goatApp/controller/LessonController.js
+++ b/webgoat-container/src/main/webapp/js/goatApp/controller/LessonController.js
@ -143,7 +143,7 @@ define(['jquery',
 			};

 			this.restartLesson = function() {
-				self=this;
+				var self=this;
 				$.ajax({
 					url:'service/restartlesson.mvc',
 					method:'GET'
--- a/webgoat-container/src/main/webapp/js/goatApp/view/GoatRouter.js
+++ b/webgoat-container/src/main/webapp/js/goatApp/view/GoatRouter.js
@ -43,7 +43,7 @@ define(['jquery',
            });

            Backbone.history.start();
-            this.listenTo('menu:reload',this.reloadMenu)
+            this.listenTo(this.menuController, 'menu:reload',this.reloadMenu)
        },

        reloadMenu: function (curLesson) {
--- a/webgoat-container/src/main/webapp/js/libs/backbone-min.map
+++ b/webgoat-container/src/main/webapp/js/libs/backbone-min.map