From 89f6a73275fea50748a17f7dcc5cadc61bb9ede1 Mon Sep 17 00:00:00 2001 From: Matthias Grundmann Date: Thu, 7 Jun 2018 19:07:58 +0200 Subject: [PATCH] Fix next page button when url doesn't end with page number --- .../resources/static/js/goatApp/model/LessonContentModel.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webgoat-container/src/main/resources/static/js/goatApp/model/LessonContentModel.js b/webgoat-container/src/main/resources/static/js/goatApp/model/LessonContentModel.js index f26aad564..ee463fbab 100644 --- a/webgoat-container/src/main/resources/static/js/goatApp/model/LessonContentModel.js +++ b/webgoat-container/src/main/resources/static/js/goatApp/model/LessonContentModel.js @@ -32,7 +32,11 @@ define(['jquery', } this.set('content',content); this.set('lessonUrl',document.URL.replace(/\.lesson.*/,'.lesson')); - this.set('pageNum',document.URL.replace(/.*\.lesson\/(\d{1,4})$/,'$1')); + if (/.*\.lesson\/(\d{1,4})$/.test(document.URL)) { + this.set('pageNum',document.URL.replace(/.*\.lesson\/(\d{1,4})$/,'$1')); + } else { + this.set('pageNum',0); + } this.trigger('content:loaded',this,loadHelps); },