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

4 files changed, 15 insertions, 2 deletions

diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js
index 3db5c8da..f0a796bf 100644
--- a/StoneIsland/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/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/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js
index 3cfab914..3ea35418 100644
--- a/StoneIsland/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/www/js/lib/blogs/BlogView.js
@@ -52,6 +52,9 @@ var BlogView = View.extend({
       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/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js
index e35b789d..e0d5bf82 100644
--- a/StoneIsland/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/www/js/lib/products/CollectionView.js
@@ -33,7 +33,7 @@ var CollectionView = ScrollableView.extend({
     if (this.loaded) {
       return this.populate(this.data)
     }
-    this.fetch()
+    // this.fetch()
   },
   
   save: function(){
@@ -44,7 +44,7 @@ var CollectionView = ScrollableView.extend({
     if (this.loaded) return
     this.$loader.show()
     sdk.product.collection({
-      gallery_id: 32780,
+      gallery_id: app.gallery_id,
       success: this.populate.bind(this)
     })
   },
diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js
index eacfe989..87b386d3 100644
--- a/StoneIsland/www/js/lib/products/ProductView.js
+++ b/StoneIsland/www/js/lib/products/ProductView.js
@@ -168,9 +168,17 @@ var ProductView = ScrollableView.extend({
         sizes: {},
       }
     })
+    console.log(details['Item']['ModelSizes'])
+    ClassFamily: "inches"
+    Text: "34"
+
     details['Item']['ModelSizes'].forEach(function(size){
       var label = SIZE_LOOKUP[ size['Default']['Text'] ]
+      if (! label && ! size['Default']['Labeled']) {
+        label = size['Default']['Text'] + " " + size['Default']['ClassFamily']
+      }
       size_lookup[ label ] = size['SizeId']
+      console.log( label )
       sizes[ size['SizeId'] ] = {
         id: label,
         label: label.toUpperCase(),