From 85183bf6eb549cd0833bd1cc764f34c1feae0c22 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 25 Aug 2016 15:34:29 +0200 Subject: curtain thing --- StoneIsland/platforms/ios/www/js/lib/cart/CartConfirm.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'StoneIsland/platforms/ios/www/js') diff --git a/StoneIsland/platforms/ios/www/js/lib/cart/CartConfirm.js b/StoneIsland/platforms/ios/www/js/lib/cart/CartConfirm.js index e1bfb114..a82509af 100755 --- a/StoneIsland/platforms/ios/www/js/lib/cart/CartConfirm.js +++ b/StoneIsland/platforms/ios/www/js/lib/cart/CartConfirm.js @@ -128,9 +128,12 @@ var CartConfirm = FormView.extend({ }, save: function(){ + app.curtain.show("loading") promise(sdk.cart.finalize, {}).then(function(){ + app.curtain.hide("loading") app.router.go('cart/thanks') }.bind(this)).error(function(data){ + app.curtain.hide("loading") // {"Header":{"StatusCode":403,"Description":"403 Forbidden"},"Error":{"Description":"GenericApiError:CartAlreadyClosed"}} // {"Header":{"StatusCode":409,"Description":"304 NotModified"},"Error":{"Description":"FinalizationError:\\"Item has been removed from cart because it is no longer available.\\"\\n235"}}' // {"Header":{"StatusCode":409,"Description":"304 NotModified"},"Error":{"Description":"FinalizationError:\"The cart cannot be empty.\"\n233"}} -- cgit v1.2.3-70-g09d2 From a28c7299d75b592a1f47221719304fefaa2a39a7 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 30 Aug 2016 13:42:16 +0200 Subject: fix hub, fix product view --- StoneIsland/config.xml | 1 + .../UserInterfaceState.xcuserstate | Bin 41591 -> 41550 bytes StoneIsland/platforms/ios/Stone Island/config.xml | 1 + StoneIsland/platforms/ios/www/css/products.css | 8 ++++ .../platforms/ios/www/js/lib/blogs/HubView.js | 45 ++++++++++++++++----- .../ios/www/js/lib/products/CollectionView.js | 1 + .../ios/www/js/lib/products/GalleryView.js | 2 +- .../ios/www/js/lib/products/ProductView.js | 3 +- StoneIsland/www/css/products.css | 8 ++++ StoneIsland/www/js/lib/blogs/HubView.js | 45 ++++++++++++++++----- StoneIsland/www/js/lib/products/CollectionView.js | 1 + StoneIsland/www/js/lib/products/GalleryView.js | 2 +- StoneIsland/www/js/lib/products/ProductView.js | 3 +- 13 files changed, 96 insertions(+), 24 deletions(-) (limited to 'StoneIsland/platforms/ios/www/js') diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index 6a9ded95..723f7418 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -31,6 +31,7 @@ + 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 index b9412bbe..154a699b 100755 Binary files a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate and b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index aae77f74..208bc57d 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -80,4 +80,5 @@ + diff --git a/StoneIsland/platforms/ios/www/css/products.css b/StoneIsland/platforms/ios/www/css/products.css index 52fe05ee..96a6afd4 100755 --- a/StoneIsland/platforms/ios/www/css/products.css +++ b/StoneIsland/platforms/ios/www/css/products.css @@ -58,6 +58,14 @@ background-repeat: no-repeat; } +.gallery .item iframe { + width: 100%; + height: 100%; + border: 0; + padding: 0; + margin: 0; +} + .search #search { display: block } #search { display: none; diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js index e73e49a7..ce228e46 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js @@ -36,7 +36,7 @@ var HubView = ScrollableView.extend({ }).sort(function(a,b){ return a[0] > b[0] ? -1 : a[0] == b[0] ? 0 : 1 }).map(function(pair){ - console.log(pair[1]) + // console.log(pair[1]) return pair[1] }) this.$loader.hide() @@ -45,7 +45,7 @@ var HubView = ScrollableView.extend({ // id date subtitle body link store image[uri caption] this.data.forEach(function(row){ // console.log(row) - console.log(moment(row.date)) + // console.log(moment(row.date)) var t = this.template.replace(/{{id}}/g, row.id) .replace(/{{date}}/, moment(row.date).format("MM.DD.YYYY")) .replace(/{{title}}/, row.title) @@ -58,7 +58,7 @@ var HubView = ScrollableView.extend({ } this.$content.append($t) - if (row.image.length > 1) { + if (row.image && row.image.length > 1) { // image gallery var $gallery = $(".gallery-" + row.id) row.image.forEach(function(img){ @@ -82,19 +82,44 @@ var HubView = ScrollableView.extend({ } else { // single image + var url = row.link + var is_video = url.match(/youtube|youtu.be|vimeo/) + var image_url + if (row.image && row.image.length) { + image_url = row.image[0].uri + } + else if (is_video && url.match(/youtube|youtu.be/)) { + var ytid = (url.match(/v=([-_a-zA-Z0-9]{11})/i) || url.match(/youtu.be\/([-_a-zA-Z0-9]{11})/i) || url.match(/embed\/([-_a-zA-Z0-9]{11})/i))[1].split('&')[0]; + image_url = "http://i.ytimg.com/vi/" + ytid + "/hqdefault.jpg" + } + else { + image_url = "" + } + var el = document.createElement("div") - el.style.backgroundImage = "url(" + row.image[0].uri + ")" + + if (is_video) { + var ytid = (url.match(/v=([-_a-zA-Z0-9]{11})/i) || url.match(/youtu.be\/([-_a-zA-Z0-9]{11})/i) || url.match(/embed\/([-_a-zA-Z0-9]{11})/i))[1].split('&')[0]; + var tag = '' + el.innerHTML = tag + + // webkit-playsinline (html attribute) + // &playsinline=1 (yt iframe api param) + } + else { + el.style.backgroundImage = "url(" + image_url + ")" + } el.className = "item" $(".gallery-" + row.id).append(el) $(".gallery-" + row.id).data("row", row) // video, append play button - if (row.link.match(/youtube|youtu.be|vimeo/)) { - var play = document.createElement("div") - play.className = "play" - $(".gallery-" + row.id).append(play) - $(".gallery-" + row.id).addClass("gallery-video-post") - } +// if (is_video) { +// var play = document.createElement("div") +// play.className = "play" +// $(".gallery-" + row.id).append(play) +// $(".gallery-" + row.id).addClass("gallery-video-post") +// } $t.find(".gallery-left").remove() $t.find(".gallery-right").remove() } diff --git a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js index 3fd4a757..55f3b080 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js @@ -98,6 +98,7 @@ var CollectionView = ScrollableView.extend({ console.log("IS SINGLE PRODUCT") var item = data.SearchResponseFull.Results.Items[0] var url = sdk.image(item['DefaultCode10'], '13_f') + console.log(url) var img = new Image () img.src = url } diff --git a/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js b/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js index 02193f14..84210674 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js @@ -60,6 +60,6 @@ var GalleryView = View.extend({ }) -var YOOX_IMAGE_STYLE_ORDER = "ZZZ d f".split(" ") +var YOOX_IMAGE_STYLE_ORDER = "ZZZ f r d e a b c g l".split(" ") function sort_image_styles (b,a){ return (YOOX_IMAGE_STYLE_ORDER.indexOf(a)) - (YOOX_IMAGE_STYLE_ORDER.indexOf(b)) } \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js index 72ff9da3..390d2f6a 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js @@ -120,7 +120,8 @@ var ProductView = ScrollableView.extend({ var title = name_partz.join(' ') var type = title_case( data['MicroCategory'] ) var price = "$" + data['DiscountedPrice'] + ".00" - var body = descriptions['EditorialDescription'].replace(/
/g, "

") + var body = descriptions['Details'] + "
" + descriptions['EditorialDescription'] + body = body.replace(/
/g, "

") var default_color_id = this.populate_selectors(data, details) diff --git a/StoneIsland/www/css/products.css b/StoneIsland/www/css/products.css index 52fe05ee..96a6afd4 100755 --- a/StoneIsland/www/css/products.css +++ b/StoneIsland/www/css/products.css @@ -58,6 +58,14 @@ background-repeat: no-repeat; } +.gallery .item iframe { + width: 100%; + height: 100%; + border: 0; + padding: 0; + margin: 0; +} + .search #search { display: block } #search { display: none; diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js index e73e49a7..0d733494 100755 --- a/StoneIsland/www/js/lib/blogs/HubView.js +++ b/StoneIsland/www/js/lib/blogs/HubView.js @@ -36,7 +36,7 @@ var HubView = ScrollableView.extend({ }).sort(function(a,b){ return a[0] > b[0] ? -1 : a[0] == b[0] ? 0 : 1 }).map(function(pair){ - console.log(pair[1]) + // console.log(pair[1]) return pair[1] }) this.$loader.hide() @@ -45,7 +45,7 @@ var HubView = ScrollableView.extend({ // id date subtitle body link store image[uri caption] this.data.forEach(function(row){ // console.log(row) - console.log(moment(row.date)) + // console.log(moment(row.date)) var t = this.template.replace(/{{id}}/g, row.id) .replace(/{{date}}/, moment(row.date).format("MM.DD.YYYY")) .replace(/{{title}}/, row.title) @@ -58,7 +58,7 @@ var HubView = ScrollableView.extend({ } this.$content.append($t) - if (row.image.length > 1) { + if (row.image && row.image.length > 1) { // image gallery var $gallery = $(".gallery-" + row.id) row.image.forEach(function(img){ @@ -82,19 +82,44 @@ var HubView = ScrollableView.extend({ } else { // single image + var url = row.link + var is_video = url.match(/youtube|youtu.be|vimeo/) + var image_url + if (row.image && row.image.length) { + image_url = row.image[0].uri + } + else if (is_video && url.match(/youtube|youtu.be/)) { + var ytid = (url.match(/v=([-_a-zA-Z0-9]{11})/i) || url.match(/youtu.be\/([-_a-zA-Z0-9]{11})/i) || url.match(/embed\/([-_a-zA-Z0-9]{11})/i))[1].split('&')[0]; + image_url = "http://i.ytimg.com/vi/" + ytid + "/hqdefault.jpg" + } + else { + image_url = "" + } + var el = document.createElement("div") - el.style.backgroundImage = "url(" + row.image[0].uri + ")" + + if (is_video) { + var ytid = (url.match(/v=([-_a-zA-Z0-9]{11})/i) || url.match(/youtu.be\/([-_a-zA-Z0-9]{11})/i) || url.match(/embed\/([-_a-zA-Z0-9]{11})/i))[1].split('&')[0]; + var tag = '' + el.innerHTML = tag + + // webkit-playsinline (html attribute) + // &playsinline=1 (yt iframe api param) + } + else { + el.style.backgroundImage = "url(" + image_url + ")" + } el.className = "item" $(".gallery-" + row.id).append(el) $(".gallery-" + row.id).data("row", row) // video, append play button - if (row.link.match(/youtube|youtu.be|vimeo/)) { - var play = document.createElement("div") - play.className = "play" - $(".gallery-" + row.id).append(play) - $(".gallery-" + row.id).addClass("gallery-video-post") - } +// if (is_video) { +// var play = document.createElement("div") +// play.className = "play" +// $(".gallery-" + row.id).append(play) +// $(".gallery-" + row.id).addClass("gallery-video-post") +// } $t.find(".gallery-left").remove() $t.find(".gallery-right").remove() } diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js index 3fd4a757..55f3b080 100755 --- a/StoneIsland/www/js/lib/products/CollectionView.js +++ b/StoneIsland/www/js/lib/products/CollectionView.js @@ -98,6 +98,7 @@ var CollectionView = ScrollableView.extend({ console.log("IS SINGLE PRODUCT") var item = data.SearchResponseFull.Results.Items[0] var url = sdk.image(item['DefaultCode10'], '13_f') + console.log(url) var img = new Image () img.src = url } diff --git a/StoneIsland/www/js/lib/products/GalleryView.js b/StoneIsland/www/js/lib/products/GalleryView.js index 02193f14..84210674 100755 --- a/StoneIsland/www/js/lib/products/GalleryView.js +++ b/StoneIsland/www/js/lib/products/GalleryView.js @@ -60,6 +60,6 @@ var GalleryView = View.extend({ }) -var YOOX_IMAGE_STYLE_ORDER = "ZZZ d f".split(" ") +var YOOX_IMAGE_STYLE_ORDER = "ZZZ f r d e a b c g l".split(" ") function sort_image_styles (b,a){ return (YOOX_IMAGE_STYLE_ORDER.indexOf(a)) - (YOOX_IMAGE_STYLE_ORDER.indexOf(b)) } \ No newline at end of file diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js index 72ff9da3..390d2f6a 100755 --- a/StoneIsland/www/js/lib/products/ProductView.js +++ b/StoneIsland/www/js/lib/products/ProductView.js @@ -120,7 +120,8 @@ var ProductView = ScrollableView.extend({ var title = name_partz.join(' ') var type = title_case( data['MicroCategory'] ) var price = "$" + data['DiscountedPrice'] + ".00" - var body = descriptions['EditorialDescription'].replace(/
/g, "

") + var body = descriptions['Details'] + "
" + descriptions['EditorialDescription'] + body = body.replace(/
/g, "

") var default_color_id = this.populate_selectors(data, details) -- cgit v1.2.3-70-g09d2 From 8b0d192d82bf12f3d82be6e9447918521e99d5ca Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 15 Sep 2016 13:14:05 -0400 Subject: xml --- StoneIsland/config.xml | 2 +- .../user.xcuserdatad/UserInterfaceState.xcuserstate | Bin 41550 -> 41533 bytes .../ios/Stone Island/Stone Island-Info.plist | 4 ++-- StoneIsland/platforms/ios/Stone Island/config.xml | 2 +- .../platforms/ios/www/js/lib/blogs/HubView.js | 2 +- .../ios/www/js/lib/products/GalleryView.js | 2 +- StoneIsland/www/js/lib/blogs/HubView.js | 2 +- StoneIsland/www/js/lib/products/GalleryView.js | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'StoneIsland/platforms/ios/www/js') diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index 50d0c42b..3249fc69 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -1,5 +1,5 @@ - + Stone Island 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 index 632f487d..9f801103 100755 Binary files a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate and b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index 96abd27c..a8e57f0b 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 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.5.5 + 0.6.1 CFBundleSignature ???? CFBundleURLTypes @@ -70,7 +70,7 @@ CFBundleVersion - 0.5.5 + 0.6.1 LSApplicationQueriesSchemes youtube diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index 208bc57d..615bf822 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -1,5 +1,5 @@ - + diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js index ce228e46..cef2d07a 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js @@ -100,7 +100,7 @@ var HubView = ScrollableView.extend({ if (is_video) { var ytid = (url.match(/v=([-_a-zA-Z0-9]{11})/i) || url.match(/youtu.be\/([-_a-zA-Z0-9]{11})/i) || url.match(/embed\/([-_a-zA-Z0-9]{11})/i))[1].split('&')[0]; - var tag = '' + var tag = '' el.innerHTML = tag // webkit-playsinline (html attribute) diff --git a/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js b/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js index 84210674..1428aca9 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js @@ -62,4 +62,4 @@ var GalleryView = View.extend({ var YOOX_IMAGE_STYLE_ORDER = "ZZZ f r d e a b c g l".split(" ") -function sort_image_styles (b,a){ return (YOOX_IMAGE_STYLE_ORDER.indexOf(a)) - (YOOX_IMAGE_STYLE_ORDER.indexOf(b)) } \ No newline at end of file +function sort_image_styles (b,a){ return (YOOX_IMAGE_STYLE_ORDER.indexOf(b)) - (YOOX_IMAGE_STYLE_ORDER.indexOf(a)) } \ No newline at end of file diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js index 0d733494..cef2d07a 100755 --- a/StoneIsland/www/js/lib/blogs/HubView.js +++ b/StoneIsland/www/js/lib/blogs/HubView.js @@ -100,7 +100,7 @@ var HubView = ScrollableView.extend({ if (is_video) { var ytid = (url.match(/v=([-_a-zA-Z0-9]{11})/i) || url.match(/youtu.be\/([-_a-zA-Z0-9]{11})/i) || url.match(/embed\/([-_a-zA-Z0-9]{11})/i))[1].split('&')[0]; - var tag = '' + var tag = '' el.innerHTML = tag // webkit-playsinline (html attribute) diff --git a/StoneIsland/www/js/lib/products/GalleryView.js b/StoneIsland/www/js/lib/products/GalleryView.js index 84210674..1428aca9 100755 --- a/StoneIsland/www/js/lib/products/GalleryView.js +++ b/StoneIsland/www/js/lib/products/GalleryView.js @@ -62,4 +62,4 @@ var GalleryView = View.extend({ var YOOX_IMAGE_STYLE_ORDER = "ZZZ f r d e a b c g l".split(" ") -function sort_image_styles (b,a){ return (YOOX_IMAGE_STYLE_ORDER.indexOf(a)) - (YOOX_IMAGE_STYLE_ORDER.indexOf(b)) } \ No newline at end of file +function sort_image_styles (b,a){ return (YOOX_IMAGE_STYLE_ORDER.indexOf(b)) - (YOOX_IMAGE_STYLE_ORDER.indexOf(a)) } \ No newline at end of file -- cgit v1.2.3-70-g09d2