diff options
Diffstat (limited to 'public/assets')
| -rw-r--r-- | public/assets/js/app.js | 7 | ||||
| -rw-r--r-- | public/assets/js/lib/NavView.js | 11 | ||||
| -rw-r--r-- | public/assets/js/lib/ProjectView.js | 4 |
3 files changed, 16 insertions, 6 deletions
diff --git a/public/assets/js/app.js b/public/assets/js/app.js index bea8f27..6c20281 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -1,5 +1,7 @@ var app = (function() { var app = {} + + app.navigation_delay = 200 app.iscroll_options = { mouseWheel: true, @@ -70,9 +72,13 @@ var app = (function() { $(".cell, .next, .previous").css({ 'display': 'none' }) $('body').addClass('resizing') debounce(function() { + $(".item").addClass("hidden") + setTimeout(function(){ $(".cell, .next, .previous").css({ 'height': ($(".top").height() + 'px'), 'display': 'inline-block' }) + app.view.$el.removeClass("hidden") $('.top').flickity('resize') $('body').removeClass('resizing') + }, 20) }, 400) } @@ -81,6 +87,7 @@ var app = (function() { })() $(".cell, .next").css({ 'height': ($(".top").height() + 'px') }) +$(".item").addClass("hidden") $('.top').flickity(app.flickity_options).on( 'cellSelect', function(e) { var gallery = $(e.target).data('flickity') diff --git a/public/assets/js/lib/NavView.js b/public/assets/js/lib/NavView.js index f3dd97d..ae60bdf 100644 --- a/public/assets/js/lib/NavView.js +++ b/public/assets/js/lib/NavView.js @@ -16,22 +16,22 @@ var NavView = View.extend({ pick: function(id){ var view = app.lookup[ id ] - this.swap( view ) + this.swap( view, "down" ) }, previous: function(){ var index = Math.max( app.view.page_number - 1, 0 ) var view = app.projects[ index ] - this.swap( view ) + this.swap( view, "up" ) }, next: function(){ var index = Math.min( app.view.page_number + 1, app.projects.length - 1 ) var view = app.projects[ index ] - this.swap( view ) + this.swap( view, "down" ) }, - swap: function(view) { + swap: function(view, direction) { if (view && ! app.view) { app.view = view app.view.show() @@ -42,7 +42,10 @@ var NavView = View.extend({ } console.log(view.page_number, view.project_id) + direction = direction || "down" + addClassForPeriod( document.body, direction, app.navigation_delay ) + app.view.hide() view.show() app.view = view diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index e735c81..3bef408 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -30,13 +30,13 @@ var ProjectView = View.extend({ } this.showing = true - addClassForPeriod( this.el, "showing", 200, function(){ + addClassForPeriod( this.el, "showing", app.navigation_delay, function(){ this.showing = false }.bind(this) ) }, hide: function(){ - addClassForPeriod( this.el, "hiding", 200, function(){ + addClassForPeriod( this.el, "hiding", app.navigation_delay, function(){ this.$el.addClass("hidden") }.bind(this) ) }, |
