diff options
| -rw-r--r-- | public/assets/js/app.js | 14 | ||||
| -rw-r--r-- | public/assets/js/lib/ProjectView.js | 15 |
2 files changed, 21 insertions, 8 deletions
diff --git a/public/assets/js/app.js b/public/assets/js/app.js index 2151dab..eff6dab 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -63,7 +63,7 @@ var app = (function() { } app.resize = function(){ - $(".active .cell,.active .next,.active .previous").css({ 'display': 'none' }) + // $(".active .cell,.active .next,.active .previous").css({ 'display': 'none' }) $('body').addClass('resizing') debounce(function() { $(".active.item").addClass("hidden") @@ -83,16 +83,18 @@ var app = (function() { })() -var heights = [] $(".item").each(function(i){ var height = window.innerHeight - $(this).find(".bottom").height() - console.log(height) $(".cell, .top", this).css({ 'height': height }) }) -$('.top').flickity(app.flickity_options).on( 'cellSelect', function(e) { - var gallery = $(e.target).data('flickity') - app.header.updateSlideNumber( gallery.selectedIndex ) +$('.top').each(function(){ + if ($(this).find(".cell").length > 1) { + $(this).flickity(app.flickity_options).on( 'cellSelect', function(e) { + var gallery = $(e.target).data('flickity') + app.header.updateSlideNumber( gallery.selectedIndex ) + }) + } }) $(".item").each(function(i){ diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 726a430..575174b 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -12,8 +12,19 @@ var ProjectView = View.extend({ this.project_id = this.$el.data("id") this.page_number = opt.page_number console.log("INIT", this.project_id) - $("<div>").addClass("page-up").insertAfter( this.$(".flickity-viewport") ) - $("<div>").addClass("page-down").insertAfter( this.$(".flickity-viewport") ) + + var $viewport = this.$(".flickity-viewport") + if (! $viewport.length) { + $viewport = this.$(".cell") + } + if (! $viewport.length) { + this.$(".top").append( $("<div>").addClass("page-up") ) + this.$(".top").append( $("<div>").addClass("page-down") ) + } + else { + $("<div>").addClass("page-up").insertAfter( $viewport ) + $("<div>").addClass("page-down").insertAfter( $viewport ) + } }, show: function(){ |