diff options
| author | Jules Laplace <jules@okfoc.us> | 2016-03-29 15:39:59 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2016-03-29 15:39:59 -0400 |
| commit | 1ca0ee4ff4ce8ac88f3514dc3a24eeac5e926f3c (patch) | |
| tree | 6d189ac833f6b60b2af75e2ff12438c3ea5baa4e /public | |
| parent | e19b1cd730e943ef5b2072f55026ae260c312ee8 (diff) | |
click gallery stop propagation
Diffstat (limited to 'public')
| -rw-r--r-- | public/assets/js/app.js | 5 | ||||
| -rw-r--r-- | public/assets/js/lib/ProjectView.js | 1 |
2 files changed, 5 insertions, 1 deletions
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){ |