From 1ca0ee4ff4ce8ac88f3514dc3a24eeac5e926f3c Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 29 Mar 2016 15:39:59 -0400 Subject: click gallery stop propagation --- public/assets/js/app.js | 5 ++++- public/assets/js/lib/ProjectView.js | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'public/assets') diff --git a/public/assets/js/app.js b/public/assets/js/app.js index 6c20281..0242437 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -86,7 +86,10 @@ var app = (function() { })() -$(".cell, .next").css({ 'height': ($(".top").height() + 'px') }) +$(".top").each(function(){ + $(".cell, .next", this).css({ 'height': ($(this).height() + 'px') }) +}) + $(".item").addClass("hidden") $('.top').flickity(app.flickity_options).on( 'cellSelect', function(e) { diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 3bef408..414865f 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -4,6 +4,7 @@ var ProjectView = View.extend({ "click": "nextOrCloseNav", "click .page-up": "previous", "click .page-down": "next", + "click .flickity-viewport": "stopPropagation", }, initialize: function(opt){ -- cgit v1.2.3-70-g09d2