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

additional paging work

Browse Source
This commit is contained in:
Jason White 2016-08-30 12:14:46 -04:00
parent 9f10fd7c57
commit 1fff86fa2d
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webgoat-container/src/main/resources/static/css/main.css
View File

@ -910,6 +910,10 @@ cookie-container {
cursor:pointer; cursor:pointer;
} }
.show-prev-page:hover {
cursor:pointer;
}
/* HINTS */ /* HINTS */
#lesson-hint-container { #lesson-hint-container {
display: none; display: none;

27
webgoat-container/src/main/resources/static/js/goatApp/view/LessonContentView.js
View File

@ -43,7 +43,9 @@ define(['jquery',
this.numPages = this.$contentPages.length; this.numPages = this.$contentPages.length;
// //
if (this.numPages > 1) { if (this.numPages > 1) {
this.showCurContentPage(); //no animation on init
this.$contentPages.hide();
this.$el.find(this.$contentPages[this.currentPage]).show();
this.addPaginationControls(); this.addPaginationControls();
} }
}, },
@ -70,7 +72,7 @@ define(['jquery',
addPaginationControls: function() { addPaginationControls: function() {
this.$prevPageButton = $('<span>',{class:'glyphicon-class glyphicon glyphicon-circle-arrow-left show-prev-page'}); this.$prevPageButton = $('<span>',{class:'glyphicon-class glyphicon glyphicon-circle-arrow-left show-prev-page'});
this.$prevPageButton.unbind().on('click',this.decrementPageView); this.$prevPageButton.unbind().on('click',this.decrementPageView.bind(this));
this.$nextPageButton = $('<span>',{class:'glyphicon-class glyphicon glyphicon-circle-arrow-right show-next-page'}); this.$nextPageButton = $('<span>',{class:'glyphicon-class glyphicon glyphicon-circle-arrow-right show-next-page'});
this.$nextPageButton.unbind().on('click',this.incrementPageView.bind(this)); this.$nextPageButton.unbind().on('click',this.incrementPageView.bind(this));
@ -85,26 +87,35 @@ define(['jquery',
incrementPageView: function() { incrementPageView: function() {
if (this.currentPage < this.numPages -1) { if (this.currentPage < this.numPages -1) {
this.currentPage++; this.currentPage++;
this.showCurContentPage(); this.showCurContentPage(true);
} }
if (this.currentPage >= this.numPages -1) { if (this.currentPage >= this.numPages -1) {
//this.hideNextPageButton(); this.$nextPageButton.hide();
this.$prevPageButton.show()
} }
}, },
decrementPageView: function() { decrementPageView: function() {
if (this.currentPage > 0) { if (this.currentPage > 0) {
this.currentPage--; this.currentPage--;
this.showCurContentPage(); this.showCurContentPage(false);
} }
if (this.currentPage == 0) { if (this.currentPage == 0) {
//this.hidePrevPageButton(); this.$prevPageButton.hide();
this.$nextPageButton.show();
} }
}, },
showCurContentPage: function() { showCurContentPage: function(isIncrement) {
this.$contentPages.hide(); this.$contentPages.hide();
this.$el.find(this.$contentPages[this.currentPage]).show(); if (isIncrement) {
this.$el.find(this.$contentPages[this.currentPage]).slideDown(300);
} else {
this.$el.find(this.$contentPages[this.currentPage]).slideUp(300);
}
}, },
hideNextPageButton: function() { hideNextPageButton: function() {