summaryrefslogtreecommitdiff
path: root/site/public/assets/javascripts/_env.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-04-27 18:17:34 -0400
committerJules Laplace <jules@okfoc.us>2015-04-27 18:17:34 -0400
commita18adc059f0a6e43281549d6f84ad150410aeef4 (patch)
tree3e8caf965bb116671376b44e4f5768c9fc2ca773 /site/public/assets/javascripts/_env.js
parentdadd33a1eed5ec0f941c150e13b97dfcf3fa420b (diff)
fix menu race condition
Diffstat (limited to 'site/public/assets/javascripts/_env.js')
-rw-r--r--site/public/assets/javascripts/_env.js7
1 files changed, 3 insertions, 4 deletions
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")
}