fix ripping and data issue (actually a pointer event issue)

1 files changed, 12 insertions, 8 deletions

diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js
index e08f816..86fe1fe 100644
--- a/site/public/assets/javascripts/_env.js
+++ b/site/public/assets/javascripts/_env.js
@@ -43,7 +43,8 @@ environment.ready = function(){
     window.location.hash = hash
 
 	  $("nav a.active").removeClass("active")
-	  $(this).addClass("active")
+	  var $link = $(this)
+	  $link.addClass("active")
 	  open_entry()
     
     $("#entry_container").removeClass("visible")
@@ -88,7 +89,7 @@ environment.ready = function(){
     e.preventDefault()
 
     if (done_loading && window.location.hash == "#/index") return
-    window.location.hash = "#/index"
+    // window.location.hash = "#/index"
     
 	  $("nav a.active").removeClass("active")
     open_entry()
@@ -103,6 +104,7 @@ environment.ready = function(){
 	$(".toggleRapper").click(toggle_menu)
 	$(document).on("click", ".project", function(){
     var page = "/" + $(this).data("type") + "/" + $(this).data("id")
+    $(".entry").css("pointer-events", "none")
 	  load_hash(page)
 	})
 	$(".toplogo,.logo").click(function(e){
@@ -148,7 +150,7 @@ environment.ready = function(){
   })
   hashes['/about'] = $("nav .about")
   hashes['/contact'] = $("nav .contact")
-  hashes['/index'] = $("nav .index")
+  // hashes['/index'] = $("nav .index")
 
   if (current_hash in hashes) {
     toggle_menu()
@@ -323,13 +325,15 @@ function display_entry ($el) {
         load_video( $(this) )
       })
     }
-    if (window.location.hash.match(/about|contact|index/)) {
+    if (window.location.hash.match(/about|contact/) || $(".entry").hasClass("all")) {
       setTimeout(function(){
         $(".entry").addClass("ready")
+        if ($(".entry").hasClass("all")) {
+          setTimeout(function(){
+            $(".entry").addClass("done")
+          }, 500)
+        }
       }, 100)
-      setTimeout(function(){
-        $(".entry").addClass("done")
-      }, 600)
     }
     else {
       $(".entry").addClass("ready")
@@ -432,7 +436,7 @@ function build_gallery () {
     })
   })
   gallery.on("settle", function(){
-    $caption.html( $(gallery.selectedElement).data("caption") )
+    gallery && $caption.html( $(gallery.selectedElement).data("caption") )
   })
   gallery.on("staticClick", function(e){
     // console.log(e)