diff options
| -rw-r--r-- | public/assets/js/app.js | 1 | ||||
| -rw-r--r-- | public/assets/js/lib/HeaderView.js | 14 | ||||
| -rw-r--r-- | public/assets/js/lib/ProjectView.js | 3 | ||||
| -rw-r--r-- | templates/index.liquid | 2 |
4 files changed, 15 insertions, 5 deletions
diff --git a/public/assets/js/app.js b/public/assets/js/app.js index dba055b..e40c676 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -119,6 +119,7 @@ $('.top').each(function(){ $(this).flickity(app.flickity_options).on( 'cellSelect', function(e) { var gallery = $(e.target).data('flickity') app.header.updateSlideNumber( gallery.selectedIndex ) + console.log("UPDATE SLIDE NUMBER", gallery.selectedIndex) }) } }) diff --git a/public/assets/js/lib/HeaderView.js b/public/assets/js/lib/HeaderView.js index 80dd5f8..374f84c 100644 --- a/public/assets/js/lib/HeaderView.js +++ b/public/assets/js/lib/HeaderView.js @@ -7,6 +7,7 @@ var HeaderView = View.extend({ }, initialize: function(){ + this.$figText = this.$(".fig-text") this.$pageNumber = this.$(".page-no") this.$slideNumber = this.$(".slide-no") this.$slideCount = this.$(".slide-count") @@ -15,7 +16,7 @@ var HeaderView = View.extend({ updateSlideNumber: function(n){ n += 1 if (n < 10) n = "0" + n - this.$slideNumber.html() + this.$slideNumber.html(n) }, updatePageNumber: function(n){ @@ -25,8 +26,15 @@ var HeaderView = View.extend({ }, updateSlideCount: function(n){ - if (n < 10) n = "0" + n - this.$slideCount.html(n) + console.log(n) + if (n > 1) { + if (n < 10) n = "0" + n + this.$figText.show() + this.$slideCount.html(n) + } + else { + this.$figText.hide() + } }, toggleNav: function(){ diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 6ae581e..b119b65 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -11,6 +11,7 @@ var ProjectView = View.extend({ // this.gallery = new GalleryView () this.project_id = this.$el.data("id") this.page_number = opt.page_number + this.slide_count = this.$(".cell").length console.log("INIT", this.project_id) var $viewport = this.$(".flickity-viewport") @@ -34,7 +35,7 @@ var ProjectView = View.extend({ show: function(){ app.header.updatePageNumber( this.page_number ) app.header.updateSlideNumber( 0 ) - app.header.updateSlideCount( 1 ) + app.header.updateSlideCount( this.slide_count ) $('body').removeClass('navopen') this.$el.removeClass("hidden") this.$el.addClass("active") diff --git a/templates/index.liquid b/templates/index.liquid index 81d62b4..697bd7f 100644 --- a/templates/index.liquid +++ b/templates/index.liquid @@ -57,7 +57,7 @@ </div> <div>OKFocus LLC. - Portfolio • 2016</div> - <div>fig.<b class="slide-no">1</b> OF <b class="slide-count">3</b> • PG.<b class="page-no">1</b></div> + <div><b class="fig-text">fig.<b class="slide-no">1</b> OF <b class="slide-count">3</b> •</b> PG.<b class="page-no">1</b></div> </span> </nav> <div id="items"> |