diff options
35 files changed, 59 insertions, 19 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index aa055a93..d3fabd0e 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget id="us.okfoc.stoneisland" version="0.5.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget id="us.okfoc.stoneisland" version="0.5.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>Stone Island</name> <description> Stone Island diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate Binary files differindex b4b87def..a4f6afd7 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate +++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index fc7c7cd3..2e46028b 100755 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -57,7 +57,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.5.0</string> + <string>0.5.1</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -70,7 +70,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>0.5.0</string> + <string>0.5.1</string> <key>LSApplicationQueriesSchemes</key> <array> <string>youtube</string> diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index c9da823b..cb14d4fd 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget id="us.okfoc.stoneisland" version="0.5.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget id="us.okfoc.stoneisland" version="0.5.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <preference name="AllowInlineMediaPlayback" value="false" /> <preference name="BackupWebStorage" value="cloud" /> <preference name="DisallowOverscroll" value="false" /> diff --git a/StoneIsland/platforms/ios/www/css/blogs.css b/StoneIsland/platforms/ios/www/css/blogs.css index ca5b4c7f..c6ec7b25 100755 --- a/StoneIsland/platforms/ios/www/css/blogs.css +++ b/StoneIsland/platforms/ios/www/css/blogs.css @@ -129,6 +129,7 @@ animation: mfadein 0.6s; z-index:2; position:absolute; display:block; + animation: gallery-fade 4s forwards; } .gallery-right { border:1px solid black; @@ -149,9 +150,6 @@ animation: mfadein 0.6s; z-index:2; position:absolute; display:block; -} -.product .gallery-left, -.product .gallery-right { animation: gallery-fade 4s forwards; } diff --git a/StoneIsland/platforms/ios/www/css/cart.css b/StoneIsland/platforms/ios/www/css/cart.css index 5c910eb4..58e712b0 100755 --- a/StoneIsland/platforms/ios/www/css/cart.css +++ b/StoneIsland/platforms/ios/www/css/cart.css @@ -358,5 +358,5 @@ color:#000; } #cart .scroll, #payment .scroll, #shipping .scroll, #signup .scroll { - min-height:calc(100% + 100px) + min-height:calc(100% + 250px) }
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/css/products.css b/StoneIsland/platforms/ios/www/css/products.css index b37b6bbd..52fe05ee 100755 --- a/StoneIsland/platforms/ios/www/css/products.css +++ b/StoneIsland/platforms/ios/www/css/products.css @@ -16,6 +16,15 @@ background: rgba(245,245,245,1.0); } +#collection .single .item { + max-width: 98vw; +} +#collection .single .item img { + width: 98vw; + height: 126vw; +} + + .product #product { display: block } #product { display: none; diff --git a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-568h@2x~iphone.png b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-568h@2x~iphone.png Binary files differindex 10ed683c..47079c45 100755 --- a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-568h@2x~iphone.png +++ b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-568h@2x~iphone.png diff --git a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-667h.png b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-667h.png Binary files differindex d9bcf61d..57a8f40e 100755 --- a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-667h.png +++ b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-667h.png diff --git a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-736h.png b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-736h.png Binary files differindex 1fcef229..2f00da21 100755 --- a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-736h.png +++ b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-736h.png diff --git a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Landscape-736h.png b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Landscape-736h.png Binary files differindex eae0792d..fc6512f7 100755 --- a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Landscape-736h.png +++ b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Landscape-736h.png diff --git a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Landscape@2x~ipad.png b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Landscape@2x~ipad.png Binary files differindex 1fc8c7db..f0fa0658 100755 --- a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Landscape@2x~ipad.png +++ b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Landscape@2x~ipad.png diff --git a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Landscape~ipad.png b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Landscape~ipad.png Binary files differindex 58ea2fbd..89964903 100755 --- a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Landscape~ipad.png +++ b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Landscape~ipad.png diff --git a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Portrait@2x~ipad.png b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Portrait@2x~ipad.png Binary files differindex 1570b37d..9002f6f3 100755 --- a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Portrait@2x~ipad.png +++ b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Portrait@2x~ipad.png diff --git a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Portrait~ipad.png b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Portrait~ipad.png Binary files differindex 223e75d0..2916e875 100755 --- a/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Portrait~ipad.png +++ b/StoneIsland/platforms/ios/www/img/Resources/splash/Default-Portrait~ipad.png diff --git a/StoneIsland/platforms/ios/www/img/Resources/splash/Default@2x~iphone.png b/StoneIsland/platforms/ios/www/img/Resources/splash/Default@2x~iphone.png Binary files differindex 0098dc73..13ada67a 100755 --- a/StoneIsland/platforms/ios/www/img/Resources/splash/Default@2x~iphone.png +++ b/StoneIsland/platforms/ios/www/img/Resources/splash/Default@2x~iphone.png diff --git a/StoneIsland/platforms/ios/www/img/Resources/splash/Default~iphone.png b/StoneIsland/platforms/ios/www/img/Resources/splash/Default~iphone.png Binary files differindex 42b8fdea..19d2b2ae 100755 --- a/StoneIsland/platforms/ios/www/img/Resources/splash/Default~iphone.png +++ b/StoneIsland/platforms/ios/www/img/Resources/splash/Default~iphone.png diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index c1f497bf..886afe3b 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -1055,7 +1055,7 @@ --> </div> </div> - <input type="text" name="Phone" placeholder="PHONE NUMBER"> + <input type="number" name="Phone" placeholder="PHONE NUMBER"> <!-- <div class="checkbox-container save_as_default"> <div class="checkbox-row"> diff --git a/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js b/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js index 504827c8..8af25914 100755 --- a/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js +++ b/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js @@ -33,7 +33,7 @@ var LoginView = FormView.extend({ }, forgot_password: function(){ - window.open("http://www.stoneisland.co.uk/pages/forgotten-password", '_system') + window.open("http://www.stoneisland.com/pages/forgotten-password", '_system') }, validate_presence: { diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js index 5a024ac9..12aaf7de 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js @@ -112,6 +112,9 @@ var ArchiveView = ScrollableView.extend({ }.bind(this)) this.deferRefresh() + setTimeout(function(){ + this.deferScrollToTop() + }.bind(this), 100) }, // ['transformProp'] = "translateZ(0) translateX(-50%) translateY(-50%) "; diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/geo.js b/StoneIsland/platforms/ios/www/js/lib/etc/geo.js index 885a1c6c..22899141 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/geo.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/geo.js @@ -44,9 +44,9 @@ var geo = (function(){ var s = "" var sig = n >= 0 ? pos : neg + n = Math.abs(n) s += Math.floor(n) + "° " - n = Math.abs(n) n %= 1 n *= 60 nn = Math.floor(n) diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js b/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js index ad5745fb..4a05c4b6 100755 --- a/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js +++ b/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js @@ -7,6 +7,7 @@ var AddressView = SerializableView.extend({ events: { "change [name=Province]": 'update_country', + "focus [name]": 'scroll_up_to_phone', }, initialize: function(opt){ @@ -55,6 +56,10 @@ var AddressView = SerializableView.extend({ this.$(".country-label").html("UNITED STATES") } }, + + scroll_up_to_phone: function(e){ + app.view.scroller && app.view.scroller.scrollTo(0, -$(e.currentTarget).position().top) + }, }) diff --git a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js index 3745f563..a3b32988 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js @@ -83,6 +83,8 @@ var CollectionView = ScrollableView.extend({ this.$loader.hide() this.$content.empty() // DefaultCode10 +// data.SearchResponseFull.Results.Items.length = 1 + this.$content.toggleClass("single", (data.SearchResponseFull.Results.Items.length == 1)) data.SearchResponseFull.Results.Items.forEach(this.append.bind(this)) this.deferScrollToTop() } diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js index cb9a0c5a..9ce4a1f3 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js @@ -26,6 +26,7 @@ var ProductView = ScrollableView.extend({ this.$body = this.$(".body") this.$fit = this.$(".fit") this.$sizing = this.$(".sizing") + this.$style = this.$(".style") }, show: function(){ @@ -124,10 +125,12 @@ var ProductView = ScrollableView.extend({ var default_color_id = this.populate_selectors(data, details) if (this.not_available) { + this.$style.css("opacity", 0) this.$color.html("NOT AVAILABLE") this.$size.hide() } else { + this.$style.css("opacity", 1) var color = this.colors[default_color_id] var color_label = color.label var sizes = this.find_sizes_for_color(default_color_id) diff --git a/StoneIsland/platforms/ios/www/js/lib/view/Scrollable.js b/StoneIsland/platforms/ios/www/js/lib/view/Scrollable.js index d06ed590..0baff845 100755 --- a/StoneIsland/platforms/ios/www/js/lib/view/Scrollable.js +++ b/StoneIsland/platforms/ios/www/js/lib/view/Scrollable.js @@ -21,7 +21,7 @@ var ScrollableView = View.extend({ scrollToTop: function(){ this.scroller.refresh() - app.collection.scroller.scrollTo(0, 0) + this.scroller.scrollTo(0, 0) }, })
\ No newline at end of file diff --git a/StoneIsland/www/css/blogs.css b/StoneIsland/www/css/blogs.css index ca5b4c7f..c6ec7b25 100755 --- a/StoneIsland/www/css/blogs.css +++ b/StoneIsland/www/css/blogs.css @@ -129,6 +129,7 @@ animation: mfadein 0.6s; z-index:2; position:absolute; display:block; + animation: gallery-fade 4s forwards; } .gallery-right { border:1px solid black; @@ -149,9 +150,6 @@ animation: mfadein 0.6s; z-index:2; position:absolute; display:block; -} -.product .gallery-left, -.product .gallery-right { animation: gallery-fade 4s forwards; } diff --git a/StoneIsland/www/css/cart.css b/StoneIsland/www/css/cart.css index 5c910eb4..58e712b0 100755 --- a/StoneIsland/www/css/cart.css +++ b/StoneIsland/www/css/cart.css @@ -358,5 +358,5 @@ color:#000; } #cart .scroll, #payment .scroll, #shipping .scroll, #signup .scroll { - min-height:calc(100% + 100px) + min-height:calc(100% + 250px) }
\ No newline at end of file diff --git a/StoneIsland/www/css/products.css b/StoneIsland/www/css/products.css index b37b6bbd..52fe05ee 100755 --- a/StoneIsland/www/css/products.css +++ b/StoneIsland/www/css/products.css @@ -16,6 +16,15 @@ background: rgba(245,245,245,1.0); } +#collection .single .item { + max-width: 98vw; +} +#collection .single .item img { + width: 98vw; + height: 126vw; +} + + .product #product { display: block } #product { display: none; diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index c1f497bf..886afe3b 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -1055,7 +1055,7 @@ --> </div> </div> - <input type="text" name="Phone" placeholder="PHONE NUMBER"> + <input type="number" name="Phone" placeholder="PHONE NUMBER"> <!-- <div class="checkbox-container save_as_default"> <div class="checkbox-row"> diff --git a/StoneIsland/www/js/lib/auth/LoginView.js b/StoneIsland/www/js/lib/auth/LoginView.js index 504827c8..8af25914 100755 --- a/StoneIsland/www/js/lib/auth/LoginView.js +++ b/StoneIsland/www/js/lib/auth/LoginView.js @@ -33,7 +33,7 @@ var LoginView = FormView.extend({ }, forgot_password: function(){ - window.open("http://www.stoneisland.co.uk/pages/forgotten-password", '_system') + window.open("http://www.stoneisland.com/pages/forgotten-password", '_system') }, validate_presence: { diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js index 5a024ac9..12aaf7de 100755 --- a/StoneIsland/www/js/lib/blogs/ArchiveView.js +++ b/StoneIsland/www/js/lib/blogs/ArchiveView.js @@ -112,6 +112,9 @@ var ArchiveView = ScrollableView.extend({ }.bind(this)) this.deferRefresh() + setTimeout(function(){ + this.deferScrollToTop() + }.bind(this), 100) }, // ['transformProp'] = "translateZ(0) translateX(-50%) translateY(-50%) "; diff --git a/StoneIsland/www/js/lib/nav/AddressView.js b/StoneIsland/www/js/lib/nav/AddressView.js index ad5745fb..4a05c4b6 100755 --- a/StoneIsland/www/js/lib/nav/AddressView.js +++ b/StoneIsland/www/js/lib/nav/AddressView.js @@ -7,6 +7,7 @@ var AddressView = SerializableView.extend({ events: { "change [name=Province]": 'update_country', + "focus [name]": 'scroll_up_to_phone', }, initialize: function(opt){ @@ -55,6 +56,10 @@ var AddressView = SerializableView.extend({ this.$(".country-label").html("UNITED STATES") } }, + + scroll_up_to_phone: function(e){ + app.view.scroller && app.view.scroller.scrollTo(0, -$(e.currentTarget).position().top) + }, }) diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js index 3745f563..a3b32988 100755 --- a/StoneIsland/www/js/lib/products/CollectionView.js +++ b/StoneIsland/www/js/lib/products/CollectionView.js @@ -83,6 +83,8 @@ var CollectionView = ScrollableView.extend({ this.$loader.hide() this.$content.empty() // DefaultCode10 +// data.SearchResponseFull.Results.Items.length = 1 + this.$content.toggleClass("single", (data.SearchResponseFull.Results.Items.length == 1)) data.SearchResponseFull.Results.Items.forEach(this.append.bind(this)) this.deferScrollToTop() } diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js index cb9a0c5a..9ce4a1f3 100755 --- a/StoneIsland/www/js/lib/products/ProductView.js +++ b/StoneIsland/www/js/lib/products/ProductView.js @@ -26,6 +26,7 @@ var ProductView = ScrollableView.extend({ this.$body = this.$(".body") this.$fit = this.$(".fit") this.$sizing = this.$(".sizing") + this.$style = this.$(".style") }, show: function(){ @@ -124,10 +125,12 @@ var ProductView = ScrollableView.extend({ var default_color_id = this.populate_selectors(data, details) if (this.not_available) { + this.$style.css("opacity", 0) this.$color.html("NOT AVAILABLE") this.$size.hide() } else { + this.$style.css("opacity", 1) var color = this.colors[default_color_id] var color_label = color.label var sizes = this.find_sizes_for_color(default_color_id) diff --git a/StoneIsland/www/js/lib/view/Scrollable.js b/StoneIsland/www/js/lib/view/Scrollable.js index d06ed590..0baff845 100755 --- a/StoneIsland/www/js/lib/view/Scrollable.js +++ b/StoneIsland/www/js/lib/view/Scrollable.js @@ -21,7 +21,7 @@ var ScrollableView = View.extend({ scrollToTop: function(){ this.scroller.refresh() - app.collection.scroller.scrollTo(0, 0) + this.scroller.scrollTo(0, 0) }, })
\ No newline at end of file |
