Merge branch 'master' of github.com:okfocus/portfolio

1 files changed, 19 insertions, 20 deletions

diff --git a/public/assets/js/app.js b/public/assets/js/app.js
index 319a939..5ae0c99 100644
--- a/public/assets/js/app.js
+++ b/public/assets/js/app.js
@@ -1,7 +1,7 @@
 var app = (function() {
   var app = {}
   
-  app.navigation_delay = 200
+  app.navigation_delay = 150
 
   app.iscroll_options = {
     mouseWheel: true,
@@ -18,8 +18,8 @@ var app = (function() {
   }
 
   app.init = function() {
-    app.bind()
     app.build()
+    app.bind()
     app.ready()
   }
 
@@ -28,20 +28,24 @@ var app = (function() {
       document.addEventListener('touchmove', function(e) {
         e.preventDefault()
       })
-      FastClick.attach(document.body)
+      window.FastClick && FastClick.attach(document.body)
     }
     
     $(window).resize(app.resize)
   }
 
   app.build = function(data) {
+    app.loader = new Loader ()
 
     app.header = new HeaderView()
     app.nav = new NavView()
 
-    var items = $(".item")
+    app.$items = $(".item")
+
+    app.resizeItems()
+
     app.lookup = {}
-    app.projects = items.toArray().map(function(el, i){
+    app.projects = app.$items.toArray().map(function(el, i){
       var view = new ProjectView ({
         el: el,
         page_number: i,
@@ -63,7 +67,6 @@ var app = (function() {
         gallery && gallery.next()
       },
     })
-
   }
 
   app.ready = function() {
@@ -94,11 +97,20 @@ var app = (function() {
   }
   
   app.resizeItems = function(){
+    var windowHeight = window.innerHeight
+
+    if (is_iphone) {
+      windowHeight -= 22 // account for lower bar
+      window.scrollTo(0,0)
+    }
+
     $(".item").each(function(i){
-      var height = window.innerHeight - ($(this).find(".bottom").height() + 10)
+      
+      var height = windowHeight - ($(this).find(".bottom").height() + 10)
       if (is_desktop) {
         height -= $("nav").height() // account for top bar
       }
+
       $(".cell, .top, .previous, .next, .flickity-viewport", this).css({ 'height': height })
       var cellCount = $(this).find(".cell").length
       if ($.browser.mozilla) {
@@ -123,17 +135,4 @@ var app = (function() {
 
 })()
 
-app.resizeItems()
-
-$('.top').each(function(){
-  if ($(this).find(".cell").length > 1) {
-    $(this).flickity(app.flickity_options).on( 'cellSelect', function(e) {
-      var gallery = $(e.target).data('flickity')
-      app.header.updateSlideNumber( gallery.selectedIndex )
-    })
-  }
-})
-
-$(".item").addClass("hidden")
-
 app.init()