diff options
Diffstat (limited to 'public/assets/js')
| -rw-r--r-- | public/assets/js/app.js | 11 | ||||
| -rw-r--r-- | public/assets/js/lib/NavView.js | 8 | ||||
| -rw-r--r-- | public/assets/js/lib/ProjectView.js | 13 |
3 files changed, 18 insertions, 14 deletions
diff --git a/public/assets/js/app.js b/public/assets/js/app.js index ba7c247..bfd317b 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -80,8 +80,10 @@ var app = (function() { })() -$(".top").each(function(){ - var height = $(this).height() - 10 +var heights = [] +$(".top").each(function(i){ + var height = $(this).height() + heights[i] = height $(".cell", this).css({ 'height': (height + 'px') }) }) @@ -90,9 +92,8 @@ $('.top').flickity(app.flickity_options).on( 'cellSelect', function(e) { app.header.updateSlideNumber( gallery.selectedIndex ) }) -$(".top").each(function(){ - var height = $(this).height() - 10 - console.log(height) +$(".top").each(function(i){ + var height = heights[i] $(".previous, .next", this).css({ 'height': (height + 'px') }) }) diff --git a/public/assets/js/lib/NavView.js b/public/assets/js/lib/NavView.js index ae60bdf..0eb4671 100644 --- a/public/assets/js/lib/NavView.js +++ b/public/assets/js/lib/NavView.js @@ -20,12 +20,20 @@ var NavView = View.extend({ }, previous: function(){ + if ($('body').hasClass('navopen')) { + $('body').removeClass('navopen') + return + } var index = Math.max( app.view.page_number - 1, 0 ) var view = app.projects[ index ] this.swap( view, "up" ) }, next: function(){ + if ($('body').hasClass('navopen')) { + $('body').removeClass('navopen') + return + } var index = Math.min( app.view.page_number + 1, app.projects.length - 1 ) var view = app.projects[ index ] this.swap( view, "down" ) diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 357bbee..1528f10 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -1,7 +1,7 @@ var ProjectView = View.extend({ events: { - "click": "nextOrCloseNav", + "click": "next", "click .page-up": "previous", "click .page-down": "next", "click .top": "stopPropagation", @@ -46,15 +46,10 @@ var ProjectView = View.extend({ e.stopPropagation() app.nav.previous() }, - - nextOrCloseNav: function(e){ + + next: function(e){ e.stopPropagation() - if ($('body').hasClass('navopen')) { - $('body').removeClass('navopen') - } - else { - app.nav.next() - } + app.nav.next() }, }) |
