fix galleries and all page

1 files changed, 23 insertions, 16 deletions

diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js
index a8e1146..c7f8607 100644
--- a/site/public/assets/javascripts/_env.js
+++ b/site/public/assets/javascripts/_env.js
@@ -89,20 +89,7 @@ environment.ready = function(){
     })
 	})	
 */
-	$("nav .index").click(function (e){
-    e && e.preventDefault()
-    if (done_loading && window.location.hash == "#/index") return
-    // window.location.hash = "#/index"
-    
-	  $("nav a.active").removeClass("active")
-    open_entry()
-	  
-    $("#entry_container").removeClass("visible")
-    var $loader = $("<div>")
-    $loader.load("all .entry", function(){
-      display_entry($loader.children()[0])
-    })
-	})
+	// $("nav .index").click()
 
 	$(".toggleRapper").click(toggle_menu)
 	$(document).on("click", ".project", function(){
@@ -116,7 +103,8 @@ environment.ready = function(){
     $('.cat.active, .sub.active, .sub.a').addClass('active')
     controls.pause()
     window.location.hash = "#"
-    $(".index").trigger("click")
+    // $(".index").trigger("click")
+    load_index()
 	  // hide_entry()
 	})
 
@@ -313,6 +301,23 @@ function build_scene () {
 
 var entry_open_time = 0;
 
+function load_index (e){
+  e && e.preventDefault()
+  // if (done_loading && window.location.hash == "#/index") return
+  // window.location.hash = "#/index"
+  console.log("load index")
+  
+  $("nav a.active").removeClass("active")
+  open_entry()
+  
+  $("#entry_container").removeClass("visible")
+  var $loader = $("<div>")
+  $loader.load("all .entry", function(){
+  console.log("index did load")
+    display_entry($loader.children()[0])
+  })
+}
+
 function as_hash (txt) {
   return txt.replace(/\s/g,'_')
 }
@@ -391,7 +396,8 @@ function toggle_menu (isInitialLoad){
 
   if (menu_open && isInitialLoad !== false) {
     controls.pause()
-    $(".index").trigger("click")
+    // $(".index").trigger("click")
+    load_index()
   }
   if (! menu_open && entry_open && ! is_mobile) {
     entry_open = false
@@ -488,6 +494,7 @@ function build_gallery () {
   })
   gallery.loader.on("progress", function(imagesLoaded, loadingImage){
     $(loadingImage.img).addClass('loaded')
+    $(loadingImage.img).parent().removeClass('loading')
   })
   $(".nextbutton").click(function(){ gallery.next() })
   $(".prevbutton").click(function(){ gallery.previous() })