diff options
| -rw-r--r-- | site/public/assets/javascripts/_env.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js index f30d62d..7ff471d 100644 --- a/site/public/assets/javascripts/_env.js +++ b/site/public/assets/javascripts/_env.js @@ -99,12 +99,11 @@ environment.ready = function(){ }) $(".toggleRapper").click(toggle_menu) - $(".toplogo").click(hide_entry) $(document).on("click", ".project", function(){ var page = "/" + $(this).data("type") + "/" + $(this).data("id") load_hash(page) }) - $(".logo").click(function(e){ + $(".toplogo,.logo").click(function(e){ e.preventDefault() hide_entry() }) @@ -285,8 +284,10 @@ function display_entry ($el) { $("#entry_container").scrollTop(0) $("#entry_container").addClass("visible") - controls.setZoom(100000) - setTimeout(function(){ controls.zoom(100) }, 100) + $("#scene").addClass("fade") + setTimeout(function(){ + $("#scene").hide() + }, 200) } function hide_entry () { $("nav .active").removeClass("active") @@ -317,6 +318,7 @@ function toggle_menu (){ } if (! menu_open && ! entry_open) { window.location.hash = "#" + console.log("what") $("#scene").show() $("#entry_container").empty() controls.zoom(1500) |