From 2fd41f4e25e27646bbebae29656a98817f1afc31 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 10 Dec 2015 22:10:24 -0600 Subject: mode 755 --- StoneIsland/www/js/lib/_router.js | 0 StoneIsland/www/js/lib/account/AccountView.js | 0 StoneIsland/www/js/lib/account/OrdersView.js | 0 StoneIsland/www/js/lib/account/PaymentView.js | 0 StoneIsland/www/js/lib/account/ProfileView.js | 0 StoneIsland/www/js/lib/account/SettingsView.js | 0 StoneIsland/www/js/lib/account/ShippingView.js | 0 StoneIsland/www/js/lib/auth/LoginView.js | 0 StoneIsland/www/js/lib/auth/LogoutView.js | 0 StoneIsland/www/js/lib/auth/SignupView.js | 0 StoneIsland/www/js/lib/blogs/ArchiveView.js | 0 StoneIsland/www/js/lib/blogs/BlogView.js | 0 StoneIsland/www/js/lib/blogs/HubView.js | 0 StoneIsland/www/js/lib/blogs/PageView.js | 0 StoneIsland/www/js/lib/blogs/StoryView.js | 6 +++++- StoneIsland/www/js/lib/cart/CartConfirm.js | 0 StoneIsland/www/js/lib/cart/CartError.js | 0 StoneIsland/www/js/lib/cart/CartPayment.js | 0 StoneIsland/www/js/lib/cart/CartShipping.js | 0 StoneIsland/www/js/lib/cart/CartSummary.js | 4 ++++ StoneIsland/www/js/lib/cart/CartThanks.js | 0 StoneIsland/www/js/lib/cart/CartView.js | 0 StoneIsland/www/js/lib/etc/deeplink.js | 0 StoneIsland/www/js/lib/etc/geo.js | 0 StoneIsland/www/js/lib/etc/push.js | 0 StoneIsland/www/js/lib/nav/AddressView.js | 0 StoneIsland/www/js/lib/nav/CreditCardView.js | 0 StoneIsland/www/js/lib/nav/CurtainView.js | 0 StoneIsland/www/js/lib/nav/FooterView.js | 0 StoneIsland/www/js/lib/nav/HeaderView.js | 2 +- StoneIsland/www/js/lib/nav/IntroView.js | 0 StoneIsland/www/js/lib/nav/NavView.js | 0 StoneIsland/www/js/lib/nav/SearchView.js | 0 StoneIsland/www/js/lib/products/ClosedStoreView.js | 0 StoneIsland/www/js/lib/products/CollectionView.js | 5 ++++- StoneIsland/www/js/lib/products/GalleryView.js | 0 StoneIsland/www/js/lib/products/ProductView.js | 1 + StoneIsland/www/js/lib/products/Selector.js | 0 StoneIsland/www/js/lib/products/filters/CategoryFilter.js | 0 StoneIsland/www/js/lib/view/Router.js | 0 StoneIsland/www/js/lib/view/Scrollable.js | 0 StoneIsland/www/js/lib/view/Serializable.js | 0 StoneIsland/www/js/lib/view/View.js | 0 43 files changed, 15 insertions(+), 3 deletions(-) mode change 100644 => 100755 StoneIsland/www/js/lib/_router.js mode change 100644 => 100755 StoneIsland/www/js/lib/account/AccountView.js mode change 100644 => 100755 StoneIsland/www/js/lib/account/OrdersView.js mode change 100644 => 100755 StoneIsland/www/js/lib/account/PaymentView.js mode change 100644 => 100755 StoneIsland/www/js/lib/account/ProfileView.js mode change 100644 => 100755 StoneIsland/www/js/lib/account/SettingsView.js mode change 100644 => 100755 StoneIsland/www/js/lib/account/ShippingView.js mode change 100644 => 100755 StoneIsland/www/js/lib/auth/LoginView.js mode change 100644 => 100755 StoneIsland/www/js/lib/auth/LogoutView.js mode change 100644 => 100755 StoneIsland/www/js/lib/auth/SignupView.js mode change 100644 => 100755 StoneIsland/www/js/lib/blogs/ArchiveView.js mode change 100644 => 100755 StoneIsland/www/js/lib/blogs/BlogView.js mode change 100644 => 100755 StoneIsland/www/js/lib/blogs/HubView.js mode change 100644 => 100755 StoneIsland/www/js/lib/blogs/PageView.js mode change 100644 => 100755 StoneIsland/www/js/lib/blogs/StoryView.js mode change 100644 => 100755 StoneIsland/www/js/lib/cart/CartConfirm.js mode change 100644 => 100755 StoneIsland/www/js/lib/cart/CartError.js mode change 100644 => 100755 StoneIsland/www/js/lib/cart/CartPayment.js mode change 100644 => 100755 StoneIsland/www/js/lib/cart/CartShipping.js mode change 100644 => 100755 StoneIsland/www/js/lib/cart/CartSummary.js mode change 100644 => 100755 StoneIsland/www/js/lib/cart/CartThanks.js mode change 100644 => 100755 StoneIsland/www/js/lib/cart/CartView.js mode change 100644 => 100755 StoneIsland/www/js/lib/etc/deeplink.js mode change 100644 => 100755 StoneIsland/www/js/lib/etc/geo.js mode change 100644 => 100755 StoneIsland/www/js/lib/etc/push.js mode change 100644 => 100755 StoneIsland/www/js/lib/nav/AddressView.js mode change 100644 => 100755 StoneIsland/www/js/lib/nav/CreditCardView.js mode change 100644 => 100755 StoneIsland/www/js/lib/nav/CurtainView.js mode change 100644 => 100755 StoneIsland/www/js/lib/nav/FooterView.js mode change 100644 => 100755 StoneIsland/www/js/lib/nav/HeaderView.js mode change 100644 => 100755 StoneIsland/www/js/lib/nav/IntroView.js mode change 100644 => 100755 StoneIsland/www/js/lib/nav/NavView.js mode change 100644 => 100755 StoneIsland/www/js/lib/nav/SearchView.js mode change 100644 => 100755 StoneIsland/www/js/lib/products/ClosedStoreView.js mode change 100644 => 100755 StoneIsland/www/js/lib/products/CollectionView.js mode change 100644 => 100755 StoneIsland/www/js/lib/products/GalleryView.js mode change 100644 => 100755 StoneIsland/www/js/lib/products/ProductView.js mode change 100644 => 100755 StoneIsland/www/js/lib/products/Selector.js mode change 100644 => 100755 StoneIsland/www/js/lib/products/filters/CategoryFilter.js mode change 100644 => 100755 StoneIsland/www/js/lib/view/Router.js mode change 100644 => 100755 StoneIsland/www/js/lib/view/Scrollable.js mode change 100644 => 100755 StoneIsland/www/js/lib/view/Serializable.js mode change 100644 => 100755 StoneIsland/www/js/lib/view/View.js (limited to 'StoneIsland/www/js/lib') diff --git a/StoneIsland/www/js/lib/_router.js b/StoneIsland/www/js/lib/_router.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/account/AccountView.js b/StoneIsland/www/js/lib/account/AccountView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/account/OrdersView.js b/StoneIsland/www/js/lib/account/OrdersView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/account/PaymentView.js b/StoneIsland/www/js/lib/account/PaymentView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/account/ProfileView.js b/StoneIsland/www/js/lib/account/ProfileView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/account/SettingsView.js b/StoneIsland/www/js/lib/account/SettingsView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/account/ShippingView.js b/StoneIsland/www/js/lib/account/ShippingView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/auth/LoginView.js b/StoneIsland/www/js/lib/auth/LoginView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/auth/LogoutView.js b/StoneIsland/www/js/lib/auth/LogoutView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/blogs/PageView.js b/StoneIsland/www/js/lib/blogs/PageView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/blogs/StoryView.js b/StoneIsland/www/js/lib/blogs/StoryView.js old mode 100644 new mode 100755 index 84684ff7..6450f0a1 --- 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 old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/cart/CartError.js b/StoneIsland/www/js/lib/cart/CartError.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/cart/CartPayment.js b/StoneIsland/www/js/lib/cart/CartPayment.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/cart/CartShipping.js b/StoneIsland/www/js/lib/cart/CartShipping.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/cart/CartSummary.js b/StoneIsland/www/js/lib/cart/CartSummary.js old mode 100644 new mode 100755 index ff1e001f..e1894a68 --- 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 old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/cart/CartView.js b/StoneIsland/www/js/lib/cart/CartView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/etc/deeplink.js b/StoneIsland/www/js/lib/etc/deeplink.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/etc/geo.js b/StoneIsland/www/js/lib/etc/geo.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/etc/push.js b/StoneIsland/www/js/lib/etc/push.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/nav/AddressView.js b/StoneIsland/www/js/lib/nav/AddressView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/nav/CreditCardView.js b/StoneIsland/www/js/lib/nav/CreditCardView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/nav/CurtainView.js b/StoneIsland/www/js/lib/nav/CurtainView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/nav/FooterView.js b/StoneIsland/www/js/lib/nav/FooterView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/nav/HeaderView.js b/StoneIsland/www/js/lib/nav/HeaderView.js old mode 100644 new mode 100755 index b2f01208..73fe106d --- 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 old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/nav/NavView.js b/StoneIsland/www/js/lib/nav/NavView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/nav/SearchView.js b/StoneIsland/www/js/lib/nav/SearchView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/products/ClosedStoreView.js b/StoneIsland/www/js/lib/products/ClosedStoreView.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js old mode 100644 new mode 100755 index d4315514..80d25718 --- 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 old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js old mode 100644 new mode 100755 index 4789850a..3cb66600 --- 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 old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/products/filters/CategoryFilter.js b/StoneIsland/www/js/lib/products/filters/CategoryFilter.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/view/Router.js b/StoneIsland/www/js/lib/view/Router.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/view/Scrollable.js b/StoneIsland/www/js/lib/view/Scrollable.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/view/Serializable.js b/StoneIsland/www/js/lib/view/Serializable.js old mode 100644 new mode 100755 diff --git a/StoneIsland/www/js/lib/view/View.js b/StoneIsland/www/js/lib/view/View.js old mode 100644 new mode 100755 -- cgit v1.2.3-70-g09d2