Merge branch 'master' of https://github.com/okfocus/stone-island

3 files changed, 26 insertions, 0 deletions

diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js
index 3db5c8da..f0a796bf 100644
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js
@@ -33,6 +33,8 @@ var ArchiveView = ScrollableView.extend({
   },
 
   populate: function(data){
+    if (this.loaded) { return }
+    this.loaded = true
     this.data = data
     this.$loader.hide()
     this.$content.empty()
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
index 19666f8b..3ea35418 100644
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
@@ -42,6 +42,19 @@ var BlogView = View.extend({
     if (data.store[0].StoreIsOpen !== "true") {
       app.closed.storeIsClosed = true
     }
+    var fits_large = (data.store[0].FitsLarge === "true")
+    
+    app.product.$fit.toggle( fits_large )
+    app.product.$sizing.toggle( fits_large )
+    
+    if (data.store[0].BackgroundIsGray === "true") {
+      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/platforms/ios/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
index 3b2900ad..a6ae958e 100644
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
@@ -5,6 +5,8 @@ var HubView = ScrollableView.extend({
 
   events: {
     "click .store": "store_link",
+    "click .gallery-left": "gallery_left",
+    "click .gallery-right": "gallery_right",
   },
   
   initialize: function(){
@@ -73,6 +75,8 @@ var HubView = ScrollableView.extend({
           play.className = "play"
           $(".gallery-" + row.id).append(play)
         }
+        $t.find("gallery-left").remove()
+        $t.find("gallery-right").remove()
       }
       
     }.bind(this))
@@ -83,5 +87,12 @@ var HubView = ScrollableView.extend({
   store_link: function(){
     app.router.go("store")
   },
+  
+  gallery_prev: function(e){
+    $(e.currentTarget).closest("hub_item").flickity('prev')
+  },
+  gallery_next: function(e){
+    $(e.currentTarget).closest("hub_item").flickity('next')
+  },
 
 })
\ No newline at end of file