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

lesson pagination fixes mainly, some other fixes included & clean up

Browse Source
This commit is contained in:
Jason White
2016-11-17 08:06:00 -05:00
parent 1436839b42
commit d11635f9da
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,12 +30,18 @@ define(['jquery',
this.currentPage = 0; this.currentPage = 0;
this.$contentPages = this.$el.find('.lesson-page-wrapper'); this.$contentPages = this.$el.find('.lesson-page-wrapper');
this.numPages = this.$contentPages.length; this.numPages = this.$contentPages.length;
// //
this.addPaginationControls();
if (this.numPages > 1) { if (this.numPages > 1) {
//no animation on init //no animation on init
this.$contentPages.hide(); this.$contentPages.hide();
this.$el.find(this.$contentPages[this.currentPage]).show(); this.$el.find(this.$contentPages[this.currentPage]).show();
this.addPaginationControls(); this.showNextPageButton();
this.hidePrevPageButton();
} else if (this.numPages === 1) {
this.hideNextPageButton();
this.hidePrevPageButton();
} }
}, },
@ -110,31 +116,25 @@ define(['jquery',
}, },
addPaginationControls: function() { addPaginationControls: function() {
var pagingControlsDiv var pagingControlsDiv;
this.$el.html(); this.$el.html();
// remove this.$prevPageButton refs ??? hide/show not really working //prev
this.$prevPageButton = $('<span>',{class:'glyphicon-class glyphicon glyphicon-circle-arrow-left show-prev-page'}); var prevPageButton = $('<span>',{class:'glyphicon-class glyphicon glyphicon-circle-arrow-left show-prev-page'});
this.$prevPageButton.unbind().on('click',this.decrementPageView.bind(this)); prevPageButton.unbind().on('click',this.decrementPageView.bind(this));
//next
this.$nextPageButton = $('<span>',{class:'glyphicon-class glyphicon glyphicon-circle-arrow-right show-next-page'}); var nextPageButton = $('<span>',{class:'glyphicon-class glyphicon glyphicon-circle-arrow-right show-next-page'});
this.$nextPageButton.unbind().on('click',this.incrementPageView.bind(this)); nextPageButton.unbind().on('click',this.incrementPageView.bind(this));
//add to DOM
if (this.$el.find('#lesson-page-controls').length < 1) { if (this.$el.find('#lesson-page-controls').length < 1) {
pagingControlsDiv = $('<div>',{class:'panel-body', id:'lesson-page-controls'}); pagingControlsDiv = $('<div>',{class:'panel-body', id:'lesson-page-controls'});
pagingControlsDiv.append(this.$prevPageButton); pagingControlsDiv.append(prevPageButton);
pagingControlsDiv.append(this.$nextPageButton); pagingControlsDiv.append(nextPageButton);
this.$el.append(pagingControlsDiv); this.$el.append(pagingControlsDiv);
} }
this.$prevPageButton.hide();
if (this.numPages > 0 ) {
this.$nextPageButton.show();
}
}, },
/* show & hide pagination controls */
showPrevPageButton: function() { showPrevPageButton: function() {
$('span.glyphicon-class.glyphicon.glyphicon-circle-arrow-left.show-prev-page').show(); $('span.glyphicon-class.glyphicon.glyphicon-circle-arrow-left.show-prev-page').show();
}, },
@ -151,6 +151,7 @@ define(['jquery',
$('span.glyphicon-class.glyphicon.glyphicon-circle-arrow-right.show-next-page').hide(); $('span.glyphicon-class.glyphicon.glyphicon-circle-arrow-right.show-next-page').hide();
}, },
/* increment, decrement & display handlers */
incrementPageView: function() { incrementPageView: function() {
if (this.currentPage < this.numPages -1) { if (this.currentPage < this.numPages -1) {
this.currentPage++; this.currentPage++;