summaryrefslogtreecommitdiff
path: root/public/assets/js
diff options
context:
space:
mode:
author“Ryder <“r@okfoc.us”>2016-03-29 17:29:38 -0400
committer“Ryder <“r@okfoc.us”>2016-03-29 17:29:38 -0400
commitb65a71fb6e34e8988eae5357a6d42ba5bb172539 (patch)
treed9ac918a4973735f7d56b29d46e0a3801d5f921d /public/assets/js
parent5bbafb5aba5dacc63323717036a97eeadb9ecfa6 (diff)
add active class
Diffstat (limited to 'public/assets/js')
-rw-r--r--public/assets/js/app.js10
-rw-r--r--public/assets/js/lib/ProjectView.js3
2 files changed, 7 insertions, 6 deletions
diff --git a/public/assets/js/app.js b/public/assets/js/app.js
index bfd317b..c6d31ec 100644
--- a/public/assets/js/app.js
+++ b/public/assets/js/app.js
@@ -63,16 +63,16 @@ var app = (function() {
}
app.resize = function(){
- $(".cell, .next, .previous").css({ 'display': 'none' })
+ $(".active .cell,.active .next,.active .previous").css({ 'display': 'none' })
$('body').addClass('resizing')
debounce(function() {
- $(".item").addClass("hidden")
+ $(".active.item").addClass("hidden")
setTimeout(function(){
- $(".cell, .next, .previous").css({ 'height': ($(".top").height() + 'px'), 'display': 'inline-block' })
+ $(".active .cell,.active .next,.active .previous").css({ 'height': ($(".active .top").height() + 'px'), 'display': 'inline-block' })
app.view.$el.removeClass("hidden")
- $('.top').flickity('resize')
+ $('.active .top').flickity('resize')
$('body').removeClass('resizing')
- }, 20)
+ }, 400)
}, 400)
}
diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js
index 52ff128..655d37e 100644
--- a/public/assets/js/lib/ProjectView.js
+++ b/public/assets/js/lib/ProjectView.js
@@ -22,7 +22,7 @@ var ProjectView = View.extend({
app.header.updateSlideCount( 1 )
$('body').removeClass('navopen')
this.$el.removeClass("hidden")
-
+ this.$el.addClass("active")
if (this.project_id == "cover") {
app.router.pushState("/")
}
@@ -39,6 +39,7 @@ var ProjectView = View.extend({
hide: function(){
addClassForPeriod( this.el, "hiding", app.navigation_delay, function(){
this.$el.addClass("hidden")
+ this.$el.removeClass("active")
}.bind(this) )
},