From a18adc059f0a6e43281549d6f84ad150410aeef4 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 27 Apr 2015 18:17:34 -0400 Subject: fix menu race condition --- site/public/assets/javascripts/_env.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'site') diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js index 860222f..00d54d8 100644 --- a/site/public/assets/javascripts/_env.js +++ b/site/public/assets/javascripts/_env.js @@ -87,7 +87,6 @@ environment.ready = function(){ }) $("nav .index").click(function (e){ e && e.preventDefault() - if (done_loading && window.location.hash == "#/index") return // window.location.hash = "#/index" @@ -158,7 +157,7 @@ environment.ready = function(){ // hashes['/index'] = $("nav .index") if (current_hash in hashes) { - toggle_menu() + toggle_menu(false) load_hash(current_hash) setTimeout(build_scene, 200) } @@ -363,7 +362,7 @@ function hide_entry () { controls.zoom(1500) window.location.hash = "#" } -function toggle_menu (){ +function toggle_menu (isInitialLoad){ $("body").toggleClass("menuActive") menu_open = $("body").hasClass("menuActive") @@ -371,7 +370,7 @@ function toggle_menu (){ $("#entry_container").removeClass("visible") } - if (menu_open) { + if (menu_open && isInitialLoad !== false) { controls.pause() $(".index").trigger("click") } -- cgit v1.2.3-70-g09d2