diff options
| author | Jules Laplace <jules@okfoc.us> | 2015-04-27 18:10:49 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2015-04-27 18:10:49 -0400 |
| commit | dadd33a1eed5ec0f941c150e13b97dfcf3fa420b (patch) | |
| tree | 140620c8afe2e29560fdcc7c5286224e55b33a5f /site/public/assets/javascripts/_env.js | |
| parent | 33d53f77febc0c2732827720295c862e1d5fc34f (diff) | |
hash/logo stuff
Diffstat (limited to 'site/public/assets/javascripts/_env.js')
| -rw-r--r-- | site/public/assets/javascripts/_env.js | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js index 60f6528..860222f 100644 --- a/site/public/assets/javascripts/_env.js +++ b/site/public/assets/javascripts/_env.js @@ -85,8 +85,8 @@ environment.ready = function(){ display_entry($loader.children()[0]) }) }) - $("nav .index").click(function(e){ - e.preventDefault() + $("nav .index").click(function (e){ + e && e.preventDefault() if (done_loading && window.location.hash == "#/index") return // window.location.hash = "#/index" @@ -109,7 +109,12 @@ environment.ready = function(){ }) $(".toplogo,.logo").click(function(e){ e.preventDefault() - hide_entry() + $(".active").removeClass('active') + $('.cat.active, .sub.active, .sub.a').addClass('active') + controls.pause() + window.location.hash = "#" + $(".index").trigger("click") + // hide_entry() }) Share.init() @@ -330,7 +335,7 @@ function display_entry ($el) { $(".entry").addClass("ready") if ($(".entry").hasClass("all")) { setTimeout(function(){ - $(".entry").addClass("done") + $(".entry").removeClass("undone") }, 500) } }, 100) @@ -431,7 +436,6 @@ function build_gallery () { }) gallery.on("cellSelect", function(){ - console.log("DUH") $caption.html( $(gallery.selectedElement).data("caption") ) videos.forEach(function(player){ player.api('pause') |
