From ec2fc5a77cad7c246f30fe874982393273873ecb Mon Sep 17 00:00:00 2001 From: misfir3 Date: Tue, 15 Nov 2016 21:01:16 -0500 Subject: [PATCH] Fixing hide/show of next/prev buttons --- .../js/goatApp/view/LessonContentView.js | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/webgoat-container/src/main/resources/static/js/goatApp/view/LessonContentView.js b/webgoat-container/src/main/resources/static/js/goatApp/view/LessonContentView.js index 7d79fac85..8d8070af4 100644 --- a/webgoat-container/src/main/resources/static/js/goatApp/view/LessonContentView.js +++ b/webgoat-container/src/main/resources/static/js/goatApp/view/LessonContentView.js @@ -112,6 +112,7 @@ define(['jquery', addPaginationControls: function() { var pagingControlsDiv this.$el.html(); + // remove this.$prevPageButton refs ??? hide/show not really working this.$prevPageButton = $('',{class:'glyphicon-class glyphicon glyphicon-circle-arrow-left show-prev-page'}); this.$prevPageButton.unbind().on('click',this.decrementPageView.bind(this)); @@ -124,12 +125,30 @@ define(['jquery', pagingControlsDiv.append(this.$nextPageButton); this.$el.append(pagingControlsDiv); } - // + + this.$prevPageButton.hide(); + if (this.numPages > 0 ) { this.$nextPageButton.show(); } - this.$prevPageButton.hide(); + + }, + + showPrevPageButton: function() { + $('span.glyphicon-class.glyphicon.glyphicon-circle-arrow-left.show-prev-page').show(); + }, + + hidePrevPageButton: function() { + $('span.glyphicon-class.glyphicon.glyphicon-circle-arrow-left.show-prev-page').hide(); + }, + + showNextPageButton: function() { + $('span.glyphicon-class.glyphicon.glyphicon-circle-arrow-right.show-next-page').show(); + }, + + hideNextPageButton: function() { + $('span.glyphicon-class.glyphicon.glyphicon-circle-arrow-right.show-next-page').hide(); }, incrementPageView: function() { @@ -139,12 +158,12 @@ define(['jquery', } if (this.currentPage > 0) { - this.$prevPageButton.show(); + this.showPrevPageButton(); } if (this.currentPage >= this.numPages -1) { - this.$nextPageButton.hide(); - this.$prevPageButton.show() + this.hideNextPageButton(); + this.showPrevPageButton; } }, @@ -155,12 +174,12 @@ define(['jquery', } if (this.currentPage < this.numPages -1) { - this.$nextPageButton.show(); + this.showNextPageButton(); } if (this.currentPage == 0) { - this.$prevPageButton.hide(); - this.$nextPageButton.show(); + this.hidePrevPageButton(); + this.showNextPageButton() } }, @@ -168,10 +187,6 @@ define(['jquery', showCurContentPage: function(isIncrement) { this.$contentPages.hide(); this.$el.find(this.$contentPages[this.currentPage]).show(); - }, - - hideNextPageButton: function() { - } });