3 files changed, 26 insertions, 19 deletions

diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js
index 254df6d1..a1863b67 100755
--- a/StoneIsland/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/www/js/lib/blogs/ArchiveView.js
@@ -78,6 +78,7 @@ var ArchiveView = ScrollableView.extend({
     count = count || row.images.length
     
     row.images.forEach(function(cell, i){
+      if (count && i > count) { return }
       var $t = $("<div>")
       $t.addClass("row").addClass("loading")
       var t = this.row_template.replace(/{{image}}/, cell.uri)
diff --git a/StoneIsland/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js
index 51881aa5..ffd09fe1 100755
--- a/StoneIsland/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/www/js/lib/blogs/BlogView.js
@@ -24,6 +24,29 @@ var BlogView = View.extend({
     this.loaded = true
     this.data = data = typeof data == "string" ? JSON.parse(data) : data
 
+    switch (data.store[0].StoreStatus) {
+      case "open":
+        app.closed.storeIsClosed = false
+        break
+      case "closed":
+        app.closed.storeIsClosed = true
+        app.closed.storeOpenDate = null
+        break
+      case "openson":
+        app.closed.storeIsClosed = true
+        app.closed.storeOpenDate = moment(data.store[0].OpensOn)
+        break
+    }
+    
+    if (app.closed.storeIsClosed) {
+      app.closed.populate(data.store[0].ClosedStoreImages)
+    }
+    else {
+      app.gallery_id = data.store[0].CollectionId
+      app.collection.setCollectionName( data.store[0].collection )
+      app.collection.fetch()
+    }
+
     app.archive.populate(data.archive)
     this.loader.preloadImage(data.hub[0].image[0].uri, function(img){
       app.hub.populate(data.hub)
@@ -39,22 +62,7 @@ var BlogView = View.extend({
     data.page.forEach(function(page){
       app[page.tag].populate(page)
     })
-    app.collection.setCollectionName( data.store[0].collection )
 
-    app.closed.populate(data.store[0].ClosedStoreImages)
-    switch (data.store[0].StoreStatus) {
-      case "open":
-        app.closed.storeIsClosed = false
-        break
-      case "closed":
-        app.closed.storeIsClosed = true
-        app.closed.storeOpenDate = null
-        break
-      case "openson":
-        app.closed.storeIsClosed = true
-        app.closed.storeOpenDate = moment(data.store[0].OpensOn)
-        break
-    }
     console.log(data.store[0].StoreStatus)
 
     var fits_large = (data.store[0].FitsLarge === "true")
@@ -65,10 +73,6 @@ var BlogView = View.extend({
       app.collection.$el.addClass("gray")
       app.product.gallery.$el.addClass("gray")
     }
-    
-    app.gallery_id = data.store[0].CollectionId
-    
-    app.collection.fetch()
   },
 
 })
\ No newline at end of file
diff --git a/StoneIsland/www/js/lib/blogs/StoryView.js b/StoneIsland/www/js/lib/blogs/StoryView.js
index a10c8351..98cd330b 100755
--- a/StoneIsland/www/js/lib/blogs/StoryView.js
+++ b/StoneIsland/www/js/lib/blogs/StoryView.js
@@ -15,6 +15,7 @@ var StoryView = ScrollableView.extend({
     this.$content = this.$(".content")
     this.$links = this.$(".links")
     this.$loader = this.$(".loader")
+    this.loader = new Loader ()
     this.scroller = new IScroll('#story', app.iscroll_options)
   },
 
@@ -60,6 +61,7 @@ var StoryView = ScrollableView.extend({
     var section = this.sections[id]
     var replace = this.$img
     // optional image transition.. ?
+    
     this.$img.fadeTo(110,0.65, function() {
       replace.attr("src", section.image.uri)
     }).fadeTo(130,1)