mode 755HEADmaster

43 files changed, 15 insertions, 3 deletions

diff --git a/StoneIsland/www/js/lib/_router.js b/StoneIsland/www/js/lib/_router.js
index b1fa1c97..b1fa1c97 100644..100755
--- a/StoneIsland/www/js/lib/_router.js
+++ b/StoneIsland/www/js/lib/_router.js
diff --git a/StoneIsland/www/js/lib/account/AccountView.js b/StoneIsland/www/js/lib/account/AccountView.js
index 1c5c9f16..1c5c9f16 100644..100755
--- a/StoneIsland/www/js/lib/account/AccountView.js
+++ b/StoneIsland/www/js/lib/account/AccountView.js
diff --git a/StoneIsland/www/js/lib/account/OrdersView.js b/StoneIsland/www/js/lib/account/OrdersView.js
index a1b83767..a1b83767 100644..100755
--- a/StoneIsland/www/js/lib/account/OrdersView.js
+++ b/StoneIsland/www/js/lib/account/OrdersView.js
diff --git a/StoneIsland/www/js/lib/account/PaymentView.js b/StoneIsland/www/js/lib/account/PaymentView.js
index 03dc8cbf..03dc8cbf 100644..100755
--- a/StoneIsland/www/js/lib/account/PaymentView.js
+++ b/StoneIsland/www/js/lib/account/PaymentView.js
diff --git a/StoneIsland/www/js/lib/account/ProfileView.js b/StoneIsland/www/js/lib/account/ProfileView.js
index ed2f3536..ed2f3536 100644..100755
--- a/StoneIsland/www/js/lib/account/ProfileView.js
+++ b/StoneIsland/www/js/lib/account/ProfileView.js
diff --git a/StoneIsland/www/js/lib/account/SettingsView.js b/StoneIsland/www/js/lib/account/SettingsView.js
index 7f96bb88..7f96bb88 100644..100755
--- a/StoneIsland/www/js/lib/account/SettingsView.js
+++ b/StoneIsland/www/js/lib/account/SettingsView.js
diff --git a/StoneIsland/www/js/lib/account/ShippingView.js b/StoneIsland/www/js/lib/account/ShippingView.js
index 39baf2aa..39baf2aa 100644..100755
--- a/StoneIsland/www/js/lib/account/ShippingView.js
+++ b/StoneIsland/www/js/lib/account/ShippingView.js
diff --git a/StoneIsland/www/js/lib/auth/LoginView.js b/StoneIsland/www/js/lib/auth/LoginView.js
index 1f7438cc..1f7438cc 100644..100755
--- a/StoneIsland/www/js/lib/auth/LoginView.js
+++ b/StoneIsland/www/js/lib/auth/LoginView.js
diff --git a/StoneIsland/www/js/lib/auth/LogoutView.js b/StoneIsland/www/js/lib/auth/LogoutView.js
index 481dcb8d..481dcb8d 100644..100755
--- a/StoneIsland/www/js/lib/auth/LogoutView.js
+++ b/StoneIsland/www/js/lib/auth/LogoutView.js
diff --git a/StoneIsland/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js
index afbb8877..afbb8877 100644..100755
--- a/StoneIsland/www/js/lib/auth/SignupView.js
+++ b/StoneIsland/www/js/lib/auth/SignupView.js
diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js
index 254df6d1..254df6d1 100644..100755
--- a/StoneIsland/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/www/js/lib/blogs/ArchiveView.js
diff --git a/StoneIsland/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js
index 9b49abbd..9b49abbd 100644..100755
--- a/StoneIsland/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/www/js/lib/blogs/BlogView.js
diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js
index 49c05ff6..49c05ff6 100644..100755
--- a/StoneIsland/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/www/js/lib/blogs/HubView.js
diff --git a/StoneIsland/www/js/lib/blogs/PageView.js b/StoneIsland/www/js/lib/blogs/PageView.js
index 4bf05430..4bf05430 100644..100755
--- a/StoneIsland/www/js/lib/blogs/PageView.js
+++ b/StoneIsland/www/js/lib/blogs/PageView.js
diff --git a/StoneIsland/www/js/lib/blogs/StoryView.js b/StoneIsland/www/js/lib/blogs/StoryView.js
index 84684ff7..6450f0a1 100644..100755
--- a/StoneIsland/www/js/lib/blogs/StoryView.js
+++ b/StoneIsland/www/js/lib/blogs/StoryView.js
@@ -58,7 +58,11 @@ var StoryView = ScrollableView.extend({
     this.$content.find("[data-id=" + id + "]").addClass("active")
     
     var section = this.sections[id]
-    this.$img.attr("src", section.image.uri)
+
+    this.$img.fadeTo(110,0.65, function() {
+      this.$img.attr("src", section.image.uri)
+    }.bind(this)).fadeTo(130,1)
+
     this.deferScrollToTop()
   },
 
diff --git a/StoneIsland/www/js/lib/cart/CartConfirm.js b/StoneIsland/www/js/lib/cart/CartConfirm.js
index f6c7f1f5..f6c7f1f5 100644..100755
--- a/StoneIsland/www/js/lib/cart/CartConfirm.js
+++ b/StoneIsland/www/js/lib/cart/CartConfirm.js
diff --git a/StoneIsland/www/js/lib/cart/CartError.js b/StoneIsland/www/js/lib/cart/CartError.js
index f9a1963e..f9a1963e 100644..100755
--- a/StoneIsland/www/js/lib/cart/CartError.js
+++ b/StoneIsland/www/js/lib/cart/CartError.js
diff --git a/StoneIsland/www/js/lib/cart/CartPayment.js b/StoneIsland/www/js/lib/cart/CartPayment.js
index f3c54d55..f3c54d55 100644..100755
--- a/StoneIsland/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/www/js/lib/cart/CartPayment.js
diff --git a/StoneIsland/www/js/lib/cart/CartShipping.js b/StoneIsland/www/js/lib/cart/CartShipping.js
index f17d42d2..f17d42d2 100644..100755
--- a/StoneIsland/www/js/lib/cart/CartShipping.js
+++ b/StoneIsland/www/js/lib/cart/CartShipping.js
diff --git a/StoneIsland/www/js/lib/cart/CartSummary.js b/StoneIsland/www/js/lib/cart/CartSummary.js
index ff1e001f..e1894a68 100644..100755
--- a/StoneIsland/www/js/lib/cart/CartSummary.js
+++ b/StoneIsland/www/js/lib/cart/CartSummary.js
@@ -156,6 +156,7 @@ var CartSummary = ScrollableView.extend({
     this.parent.$itemcount.html("0 ITEMS")
     this.el.className = "empty"
     this.parent.$steps.hide()
+    app.curtain.hide("loading")
   },
 
   save: function(){
@@ -196,6 +197,9 @@ var CartSummary = ScrollableView.extend({
       success: function(){
         app.curtain.hide("loading")
       },
+      error: function(){
+        app.curtain.hide("loading")
+      },
     })
   },
 
diff --git a/StoneIsland/www/js/lib/cart/CartThanks.js b/StoneIsland/www/js/lib/cart/CartThanks.js
index eb95197b..eb95197b 100644..100755
--- a/StoneIsland/www/js/lib/cart/CartThanks.js
+++ b/StoneIsland/www/js/lib/cart/CartThanks.js
diff --git a/StoneIsland/www/js/lib/cart/CartView.js b/StoneIsland/www/js/lib/cart/CartView.js
index 1b08e418..1b08e418 100644..100755
--- a/StoneIsland/www/js/lib/cart/CartView.js
+++ b/StoneIsland/www/js/lib/cart/CartView.js
diff --git a/StoneIsland/www/js/lib/etc/deeplink.js b/StoneIsland/www/js/lib/etc/deeplink.js
index 648dd167..648dd167 100644..100755
--- a/StoneIsland/www/js/lib/etc/deeplink.js
+++ b/StoneIsland/www/js/lib/etc/deeplink.js
diff --git a/StoneIsland/www/js/lib/etc/geo.js b/StoneIsland/www/js/lib/etc/geo.js
index fac34c1e..fac34c1e 100644..100755
--- a/StoneIsland/www/js/lib/etc/geo.js
+++ b/StoneIsland/www/js/lib/etc/geo.js
diff --git a/StoneIsland/www/js/lib/etc/push.js b/StoneIsland/www/js/lib/etc/push.js
index ab0c0141..ab0c0141 100644..100755
--- a/StoneIsland/www/js/lib/etc/push.js
+++ b/StoneIsland/www/js/lib/etc/push.js
diff --git a/StoneIsland/www/js/lib/nav/AddressView.js b/StoneIsland/www/js/lib/nav/AddressView.js
index ad5745fb..ad5745fb 100644..100755
--- a/StoneIsland/www/js/lib/nav/AddressView.js
+++ b/StoneIsland/www/js/lib/nav/AddressView.js
diff --git a/StoneIsland/www/js/lib/nav/CreditCardView.js b/StoneIsland/www/js/lib/nav/CreditCardView.js
index 63784618..63784618 100644..100755
--- a/StoneIsland/www/js/lib/nav/CreditCardView.js
+++ b/StoneIsland/www/js/lib/nav/CreditCardView.js
diff --git a/StoneIsland/www/js/lib/nav/CurtainView.js b/StoneIsland/www/js/lib/nav/CurtainView.js
index d444fd60..d444fd60 100644..100755
--- a/StoneIsland/www/js/lib/nav/CurtainView.js
+++ b/StoneIsland/www/js/lib/nav/CurtainView.js
diff --git a/StoneIsland/www/js/lib/nav/FooterView.js b/StoneIsland/www/js/lib/nav/FooterView.js
index 74b249e6..74b249e6 100644..100755
--- a/StoneIsland/www/js/lib/nav/FooterView.js
+++ b/StoneIsland/www/js/lib/nav/FooterView.js
diff --git a/StoneIsland/www/js/lib/nav/HeaderView.js b/StoneIsland/www/js/lib/nav/HeaderView.js
index b2f01208..73fe106d 100644..100755
--- a/StoneIsland/www/js/lib/nav/HeaderView.js
+++ b/StoneIsland/www/js/lib/nav/HeaderView.js
@@ -45,7 +45,7 @@ var HeaderView = View.extend({
   count: 0,
   set_cart_count: function(n){
     this.count = n
-    this.$cart_count.html(n || " ")
+    this.$cart_count.html(n || "0")
   },
   increment_cart_count: function(){
     this.$cart_count.html( ++this.count )
diff --git a/StoneIsland/www/js/lib/nav/IntroView.js b/StoneIsland/www/js/lib/nav/IntroView.js
index 2d8dca43..2d8dca43 100644..100755
--- a/StoneIsland/www/js/lib/nav/IntroView.js
+++ b/StoneIsland/www/js/lib/nav/IntroView.js
diff --git a/StoneIsland/www/js/lib/nav/NavView.js b/StoneIsland/www/js/lib/nav/NavView.js
index 704aaa34..704aaa34 100644..100755
--- a/StoneIsland/www/js/lib/nav/NavView.js
+++ b/StoneIsland/www/js/lib/nav/NavView.js
diff --git a/StoneIsland/www/js/lib/nav/SearchView.js b/StoneIsland/www/js/lib/nav/SearchView.js
index f21634a5..f21634a5 100644..100755
--- a/StoneIsland/www/js/lib/nav/SearchView.js
+++ b/StoneIsland/www/js/lib/nav/SearchView.js
diff --git a/StoneIsland/www/js/lib/products/ClosedStoreView.js b/StoneIsland/www/js/lib/products/ClosedStoreView.js
index 5f8c1e84..5f8c1e84 100644..100755
--- a/StoneIsland/www/js/lib/products/ClosedStoreView.js
+++ b/StoneIsland/www/js/lib/products/ClosedStoreView.js
diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js
index d4315514..80d25718 100644..100755
--- a/StoneIsland/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/www/js/lib/products/CollectionView.js
@@ -42,7 +42,10 @@ var CollectionView = ScrollableView.extend({
   },
     
   fetch: function(){
-    if (this.loaded) return
+    if (this.loaded) {
+      console.log("collection loaded")
+      return
+    }
     this.$loader.show()
     sdk.product.collection({
       gallery_id: app.gallery_id,
diff --git a/StoneIsland/www/js/lib/products/GalleryView.js b/StoneIsland/www/js/lib/products/GalleryView.js
index 02193f14..02193f14 100644..100755
--- a/StoneIsland/www/js/lib/products/GalleryView.js
+++ b/StoneIsland/www/js/lib/products/GalleryView.js
diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js
index 4789850a..3cb66600 100644..100755
--- a/StoneIsland/www/js/lib/products/ProductView.js
+++ b/StoneIsland/www/js/lib/products/ProductView.js
@@ -22,6 +22,7 @@ var ProductView = ScrollableView.extend({
     this.$price = this.$(".price")
     this.$size = this.$(".size")
     this.$color = this.$(".color")
+    this.$share = this.$(".share")
     this.$body = this.$(".body")
     this.$fit = this.$(".fit")
     this.$sizing = this.$(".sizing")
diff --git a/StoneIsland/www/js/lib/products/Selector.js b/StoneIsland/www/js/lib/products/Selector.js
index 76c498ec..76c498ec 100644..100755
--- a/StoneIsland/www/js/lib/products/Selector.js
+++ b/StoneIsland/www/js/lib/products/Selector.js
diff --git a/StoneIsland/www/js/lib/products/filters/CategoryFilter.js b/StoneIsland/www/js/lib/products/filters/CategoryFilter.js
index 4e6baf62..4e6baf62 100644..100755
--- a/StoneIsland/www/js/lib/products/filters/CategoryFilter.js
+++ b/StoneIsland/www/js/lib/products/filters/CategoryFilter.js
diff --git a/StoneIsland/www/js/lib/view/Router.js b/StoneIsland/www/js/lib/view/Router.js
index a8ec331f..a8ec331f 100644..100755
--- a/StoneIsland/www/js/lib/view/Router.js
+++ b/StoneIsland/www/js/lib/view/Router.js
diff --git a/StoneIsland/www/js/lib/view/Scrollable.js b/StoneIsland/www/js/lib/view/Scrollable.js
index d06ed590..d06ed590 100644..100755
--- a/StoneIsland/www/js/lib/view/Scrollable.js
+++ b/StoneIsland/www/js/lib/view/Scrollable.js
diff --git a/StoneIsland/www/js/lib/view/Serializable.js b/StoneIsland/www/js/lib/view/Serializable.js
index 98aa8ce3..98aa8ce3 100644..100755
--- a/StoneIsland/www/js/lib/view/Serializable.js
+++ b/StoneIsland/www/js/lib/view/Serializable.js
diff --git a/StoneIsland/www/js/lib/view/View.js b/StoneIsland/www/js/lib/view/View.js
index 41638ab7..41638ab7 100644..100755
--- a/StoneIsland/www/js/lib/view/View.js
+++ b/StoneIsland/www/js/lib/view/View.js