From c75e4f0b5fc83548e337af6c533036baec8c85c9 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 16 Oct 2019 02:22:53 +0200 Subject: update --- .../xcschemes/xcschememanagement.plist | 2 +- .../ios/Stone Island.xcarchive/Info.plist | 6 +- .../Applications/Stone Island.app/Assets.car | Bin 1178600 -> 1178600 bytes .../01J-lp-oVM-view-Ze5-6b-2t3.nib | Bin 2285 -> 2283 bytes .../UIViewController-01J-lp-oVM.nib | Bin 832 -> 832 bytes .../Applications/Stone Island.app/Info.plist | Bin 1760 -> 1760 bytes .../Stone Island.app/MainViewController.nib | Bin 943 -> 943 bytes .../Applications/Stone Island.app/Stone Island | Bin 2324304 -> 2324304 bytes .../Stone Island.app/_CodeSignature/CodeResources | 110 ++++++++++---------- .../Applications/Stone Island.app/config.xml | 2 +- .../Stone Island.app/embedded.mobileprovision | Bin 7717 -> 7527 bytes .../Stone Island.app/www/css/blogs.css | 20 ++++ .../Stone Island.app/www/css/products.css | 28 +++++- .../Applications/Stone Island.app/www/db.json | 2 +- .../Applications/Stone Island.app/www/index.html | 25 +++-- .../Applications/Stone Island.app/www/js/index.js | 35 +++---- .../www/js/lib/blogs/ArchiveView.js | 5 +- .../Stone Island.app/www/js/lib/blogs/HubView.js | 24 ++++- .../www/js/lib/etc/accessibility.js | 2 + .../Stone Island.app/www/js/lib/nav/FooterView.js | 2 + .../www/js/lib/products/GalleryView.js | 35 +++++-- .../www/js/lib/products/ProductView.js | 111 ++++++++++++++------- .../Stone Island.app/www/js/vendor/util.js | 2 +- .../xcschemes/xcschememanagement.plist | 2 +- .../UserInterfaceState.xcuserstate | Bin 37302 -> 37029 bytes .../ios/Stone Island/Stone Island-Info.plist | 4 +- StoneIsland/platforms/ios/Stone Island/config.xml | 2 +- StoneIsland/platforms/ios/ios.json | 2 +- StoneIsland/platforms/ios/www/css/blogs.css | 20 ++++ StoneIsland/platforms/ios/www/css/products.css | 28 +++++- StoneIsland/platforms/ios/www/db.json | 2 +- StoneIsland/platforms/ios/www/index.html | 25 +++-- StoneIsland/platforms/ios/www/js/index.js | 35 +++---- .../platforms/ios/www/js/lib/blogs/ArchiveView.js | 5 +- .../platforms/ios/www/js/lib/blogs/HubView.js | 24 ++++- .../platforms/ios/www/js/lib/etc/accessibility.js | 2 + .../platforms/ios/www/js/lib/nav/FooterView.js | 2 + .../ios/www/js/lib/products/GalleryView.js | 35 +++++-- .../ios/www/js/lib/products/ProductView.js | 111 ++++++++++++++------- StoneIsland/platforms/ios/www/js/vendor/util.js | 2 +- 40 files changed, 487 insertions(+), 225 deletions(-) (limited to 'StoneIsland/platforms/ios') diff --git a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist index 4f3362e8..3038bdb4 100644 --- a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist @@ -22,7 +22,7 @@ CordovaLib.xcscheme_^#shared#^_ orderHint - 3 + 2 diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 3c1a15d7..492b3406 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -9,9 +9,9 @@ CFBundleIdentifier us.okfoc.stoneisland CFBundleShortVersionString - 1.2.3 + 1.2.4 CFBundleVersion - 1.2.3 + 1.2.4 SigningIdentity iPhone Developer: Francesca Agusani (3ECUPBTQ5W) Team @@ -20,7 +20,7 @@ ArchiveVersion 2 CreationDate - 2019-09-03T17:36:10Z + 2019-10-15T13:42:26Z Name Stone Island SchemeName diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car index c5eab167..6c786a61 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib index 44bd0efb..a5c0a5af 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib index 2d671b31..200094d3 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist index f182f60f..1f6abc6f 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib index 6a932178..26c95177 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island index f6b65fba..1ba4f7d6 100755 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources index 5b30e4e4..f426ba0f 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources @@ -94,11 +94,11 @@ Assets.car - VH1h9C+NzgBCZrqAmWhSs/dbGmc= + Kwar1Lpeq1PSL1k9Htg3b88BLOU= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - tmw9rPRh0FHxDYK8d+XNTVAW8lE= + EZSKMENet04qnojPKjTy87Ck+kU= CDVLaunchScreen.storyboardc/Info.plist @@ -106,7 +106,7 @@ CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - GjQfqLxJ+zEF5K8ZynCdnGblEbo= + FjF8wMpbNRaWuLABS8u/DSNBgAQ= CDVNotification.bundle/beep.wav @@ -114,11 +114,11 @@ Info.plist - LHCAmJHRhZPqMmRio/xgaF1HwuM= + zgJX+PBuvZOn7XqgLJ/VpeYUnIo= MainViewController.nib - YSGSdofDJzUxj+jdvDecPcpDO78= + KTqOI00Es51zeiXqiLVhUoSBkik= PkgInfo @@ -126,11 +126,11 @@ config.xml - PqlLBIYAkd+4vr1/1jZQAJj8J7k= + fz52wQVVOwlkB35iTIUIMBC2dhA= embedded.mobileprovision - l8wkj9UX5I2v1dBJQvQf/lTQiew= + gendZ7kyekdN6egm653Da4aRvrk= www/cordova-js-src/exec.js @@ -162,7 +162,7 @@ www/css/blogs.css - SLcjU48OnlqOEA9Xii5RYPNFNDI= + 09ZjZlLNOQw7OoxGbKdCihckd6E= www/css/cart.css @@ -230,7 +230,7 @@ www/css/products.css - SXRuqV2NmKVKCeNwd7FF1tkA4/8= + i+K2W+RxK1uySUdaychd3szaRfg= www/css/vendor/flickity.css @@ -242,7 +242,7 @@ www/db.json - 5bTB9V2YtoA5QVMvp5Cu/kOlwvc= + nCdTRhbwbIPXuxkUG7gUGdg9KpQ= www/img/Resources/CDVNotification.bundle/beep.wav @@ -350,11 +350,11 @@ www/index.html - N6Ei61hN+athrqTf75/rhgH6zL0= + j+k8ujaqcnpJuX/czMBrEaZz8jk= www/js/index.js - /cmUIeMQ3DDaWZ5QbC3eB3ckBM4= + HKZPM32zArXyA4bnl5aP8A4JVic= www/js/lib/_router.js @@ -402,7 +402,7 @@ www/js/lib/blogs/ArchiveView.js - wHoTh7iyP/3X6Q6v2D07aS6+t30= + hy7Nn4x1dubd+m3LsLuwDpieX8I= www/js/lib/blogs/BlogView.js @@ -410,7 +410,7 @@ www/js/lib/blogs/HubView.js - YyQmezakSQTIXkBa75zrel7aReI= + y1ppo+9KlLX9tA/tyccz1eBydP4= www/js/lib/blogs/PageView.js @@ -450,7 +450,7 @@ www/js/lib/etc/accessibility.js - yTRyqtg1FGVi7NAS5ofPpYeCMJY= + WADhuojQGHPJ5xCqJ0lp+/1uIuM= www/js/lib/etc/backup_db.js @@ -490,7 +490,7 @@ www/js/lib/nav/FooterView.js - WaOKgFizQ3W8RPEhwga57tf3sLM= + ZZj8fj+7470dumQaosbq7OiXAx0= www/js/lib/nav/HeaderView.js @@ -518,11 +518,11 @@ www/js/lib/products/GalleryView.js - PlTNRrOKZ/pThjhfJGIhPyF0vF8= + 2uKZw/R68RVKeU/Dm93O7bC9IeA= www/js/lib/products/ProductView.js - nhowdeurib4AiVHGpPeQXHuVAZY= + NJ28uOLdIXAcLOstCEyyoSFwMFQ= www/js/lib/products/Selector.js @@ -642,7 +642,7 @@ www/js/vendor/util.js - cSu4UPfMDruX6UfHaF7e81XCbK8= + ItYn9dXlQ80otg0lHvs5ktBK08U= www/plugins/cordova-plugin-customurlscheme/www/ios/LaunchMyApp.js @@ -965,22 +965,22 @@ hash - VH1h9C+NzgBCZrqAmWhSs/dbGmc= + Kwar1Lpeq1PSL1k9Htg3b88BLOU= hash2 - syXWjwlVt8IaDz5J253dVsKDU5HNG1WcrNk5N19teV0= + 1qoqioWSqyyQKmIJUeXxYG0vy0CiJcQlNNJ/lH/i1rg= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib hash - tmw9rPRh0FHxDYK8d+XNTVAW8lE= + EZSKMENet04qnojPKjTy87Ck+kU= hash2 - pXxOQQe+v2mY83410YsYODdWMR+Yg374OWv3U1WHVZ0= + D0At/LS/sZbaIClfPU3oVFtY9eY8EnlLe+2eOFFjCvQ= CDVLaunchScreen.storyboardc/Info.plist @@ -998,11 +998,11 @@ hash - GjQfqLxJ+zEF5K8ZynCdnGblEbo= + FjF8wMpbNRaWuLABS8u/DSNBgAQ= hash2 - MDgen06oOcviHQVZDZNatF0/FamLu5exeNdKdCrUKiI= + FMfkQ1dI7KF4iEbm8hVdz7VI04npLUC8Tb5CFhcI7Ww= CDVNotification.bundle/beep.wav @@ -1020,33 +1020,33 @@ hash - YSGSdofDJzUxj+jdvDecPcpDO78= + KTqOI00Es51zeiXqiLVhUoSBkik= hash2 - QNR2oSKBv86+uT/QGNHXOLY6O9Mywi/jh3ep5+L6GXY= + lxNz93e2ckI7aZ2hWhw5PepZH8v6Z3XYr0+KYG+PaKA= config.xml hash - PqlLBIYAkd+4vr1/1jZQAJj8J7k= + fz52wQVVOwlkB35iTIUIMBC2dhA= hash2 - 0yKwA1oQBBEAO2OxvUMfrkQW9+/VMI20K8Vli4WtY6s= + i6++/3MmPSGLm1VRuP6gfk6oRwhSCR8KGgWIkERgWkk= embedded.mobileprovision hash - l8wkj9UX5I2v1dBJQvQf/lTQiew= + gendZ7kyekdN6egm653Da4aRvrk= hash2 - EkGKDjJhII43Qn+PEmfD7sVHEiZWrPJeyGj1aKMzEco= + UATtk+TXKOk5NZIU0r2QInKazo541PfMgFR/PIEBW30= www/cordova-js-src/exec.js @@ -1130,11 +1130,11 @@ hash - SLcjU48OnlqOEA9Xii5RYPNFNDI= + 09ZjZlLNOQw7OoxGbKdCihckd6E= hash2 - FSpvLts90M8yXzYK/pL6k8i55r9l1EyamPeym+AAj2M= + CtzlzhHemv5DQFCm5AUcXoTejGOsn0ds+n3TVlp03Uo= www/css/cart.css @@ -1317,11 +1317,11 @@ hash - SXRuqV2NmKVKCeNwd7FF1tkA4/8= + i+K2W+RxK1uySUdaychd3szaRfg= hash2 - R3OfPGRgptd3/0+r7zNs1A8PRvPZni6SDEA6W+kBcNE= + OJaHx68V8yCFPBzyM0D0aDZt+/+SjM2bIwjyVskN2ZM= www/css/vendor/flickity.css @@ -1350,11 +1350,11 @@ hash - 5bTB9V2YtoA5QVMvp5Cu/kOlwvc= + nCdTRhbwbIPXuxkUG7gUGdg9KpQ= hash2 - 7Jr5PoZ94tA1GbWwhhqOKNeoptZoFGI16ifArD1xwq4= + z0MlhI2VCJklAb9mV7jh0UxxJ93HJtT75ViawEj6P+M= www/img/Resources/CDVNotification.bundle/beep.wav @@ -1647,22 +1647,22 @@ hash - N6Ei61hN+athrqTf75/rhgH6zL0= + j+k8ujaqcnpJuX/czMBrEaZz8jk= hash2 - kY+ifVuBRKlbir0XnojOAeKdKZwBn/yObsDd8y8Ni6s= + 1hNa7gFvckraIa19E+Kc/1nCVUYOC10ddnGAiuUBMSM= www/js/index.js hash - /cmUIeMQ3DDaWZ5QbC3eB3ckBM4= + HKZPM32zArXyA4bnl5aP8A4JVic= hash2 - iUhVw8Cpra+wD4XsWsUMco/S7cRxepGqomKSW/zHl64= + 2EgjPLSSAqC1As/Z/Rl2nznPFvvwC5Wki10jbIXs9l0= www/js/lib/_router.js @@ -1790,11 +1790,11 @@ hash - wHoTh7iyP/3X6Q6v2D07aS6+t30= + hy7Nn4x1dubd+m3LsLuwDpieX8I= hash2 - RfpM20RknSwCAY7zbPDEpkIquL3NtjBXWU6wfcdbO5M= + LiJLs5Tio977c4D6P4Co/3c6ywImOTKuwpLgY+hbyeo= www/js/lib/blogs/BlogView.js @@ -1812,11 +1812,11 @@ hash - YyQmezakSQTIXkBa75zrel7aReI= + y1ppo+9KlLX9tA/tyccz1eBydP4= hash2 - 39fN9c2QR7jtUZumNck3TTD3M86AnscxwuG6QdcRS0E= + 08zv3aMQTQkctFQ7maI6vlZdUT8qgH8pujNzvkN57x4= www/js/lib/blogs/PageView.js @@ -1922,11 +1922,11 @@ hash - yTRyqtg1FGVi7NAS5ofPpYeCMJY= + WADhuojQGHPJ5xCqJ0lp+/1uIuM= hash2 - EpWdVbZkiGtY+imrqtGRtv2WZeL0CRTx2C4/WFF9NzQ= + Fjrwlrpwi5rt9Q6pvyftkCx9VA7KHuLHsolN4xNsu4g= www/js/lib/etc/backup_db.js @@ -2032,11 +2032,11 @@ hash - WaOKgFizQ3W8RPEhwga57tf3sLM= + ZZj8fj+7470dumQaosbq7OiXAx0= hash2 - Z2+GeBAj/oHQ6m3AxNvY8tIeLbh2Kv4ScrteiHlFdm8= + QERCwKdicHOKF6qcwAE70vS0H2PNTosnWt9mvhQb2Wo= www/js/lib/nav/HeaderView.js @@ -2109,22 +2109,22 @@ hash - PlTNRrOKZ/pThjhfJGIhPyF0vF8= + 2uKZw/R68RVKeU/Dm93O7bC9IeA= hash2 - GGDqzbrlfnfziT6ikQX/loU9bpQ6vZap1bCH/cx0Nr0= + 3NKeKuDQh7LTme/6eCnTyrieaCAOHUwtwWz+wCAipjE= www/js/lib/products/ProductView.js hash - nhowdeurib4AiVHGpPeQXHuVAZY= + NJ28uOLdIXAcLOstCEyyoSFwMFQ= hash2 - yo3bWl6j6z/M2xwX0QMeOlgX59TZdiWTiFPcUn2CEsA= + Agl/HX2pNASS06k4rf2MyePibkjt4WQaTJVomYm9yLg= www/js/lib/products/Selector.js @@ -2450,11 +2450,11 @@ hash - cSu4UPfMDruX6UfHaF7e81XCbK8= + ItYn9dXlQ80otg0lHvs5ktBK08U= hash2 - imFkJySBUiXdVgDM/cv/YIcz6CCVK8TSP5TPXrEYi2M= + 80zGuEkMLKirI91e1Rqma5g/KI0A1JZOIWVeDqOMhZ0= www/plugins/cordova-plugin-customurlscheme/www/ios/LaunchMyApp.js diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml index 727ea16c..4368e5b6 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml @@ -1,5 +1,5 @@ - + diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision index 7ec4c547..1a7c33da 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/blogs.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/blogs.css index f857db9e..c4b74c19 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/blogs.css +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/blogs.css @@ -186,6 +186,9 @@ height:100px; box-sizing:border-box } +.vscroll .fade-cover { + display: none; +} /* .fade-cover::before { @@ -264,6 +267,13 @@ ul.links { transform-origin: 50% 50%; transform: translateZ(0) translateX(-50%) translateY(-50%); } +#archive .menu { + position: fixed; + display: none; +} +#archive.menu .menu { + display: block; +} .accessible #archive .row .image, .accessible #archive .row .text { @@ -353,6 +363,16 @@ ul.links { width: 90%; } +.gallery-target { + display: none; +} +.accessible .gallery-target { + display: block; + position: absolute; + top: 0; left: 0; + width: 100vw; + height: 52vh; +} .gallery-video-post { position:relative; } diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/products.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/products.css index 63e9b020..e15e0e54 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/products.css +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/products.css @@ -55,6 +55,7 @@ } .gallery .item { + display: block; width: 100vw; height: 52vh; background-size: contain; @@ -93,6 +94,11 @@ text-align: center; width: 100%; } +#closed .closed_target { + position: absolute; + top: 0; left: 0; + width: 100%; height: 100%; +} .product .content { box-sizing:border-box; @@ -160,19 +166,31 @@ display: flex; flex-direction: row; } -.product .size-color span { - position:relative; - box-sizing:border-box; - padding: 0 12px; +.product .size-color > div { + position: relative; + box-sizing: border-box; height: 48px; font-size: 1rem; display: flex; justify-content: center; align-items: center; } -.product .size-color span.size { +.product .size-color > div > div.label { + padding: 0 12px; + max-width: 6rem; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.product .size-color div.size { border-right: 1px solid #444; } +.product .size-color > div > select { + position: absolute; + top: 0; left: 0; + width: 100%; height: 100%; + opacity: 0; +} .product .price { display:table-cell; diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/db.json b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/db.json index 8b9d322c..7bffd341 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/db.json +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/db.json @@ -4838,7 +4838,7 @@ "Departments": [ { "text": "Test", - "uri": "ctsjckts" + "uri": "PPPRVWFWSC1" } ], "StoreStatus": "closed", diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html index eaae059a..a422832c 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html @@ -138,10 +138,11 @@ +
@@ -325,11 +327,17 @@
- - +
+
+ +
+
+
+ +
- +
Fits Large
@@ -346,15 +354,16 @@
+

LOADING THE STORE, PLEASE WAIT

-
+
visit
- www.stoneisland.com + www.stoneisland.com
@@ -1359,8 +1368,8 @@ - + diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js index b90f74b1..42cec6f1 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js @@ -12,26 +12,11 @@ var app = (function(){ sdk.init({ env: "production" }) } - accessibility.init(app.prebuild) // check if we can do native scrolling before build - } - - app.prebuild = function(){ - app.bind() - app.build() - - app.iscroll_options = { - mouseWheel: true, - scrollbars: true, - disablePointer: is_android ? true : false, // important to disable the pointer events that causes the issues - disableTouch: false, // false if you want the slider to be usable with touch devices - disableMouse: false // false if you want the slider to be usable with a mouse (desktop) - } - if (window.cordova) { - document.addEventListener('deviceready', app.ready, false) + document.addEventListener('deviceready', app.device_ready, false) } else { - app.ready() + app.device_ready() } } @@ -77,8 +62,24 @@ var app = (function(){ app.selector = new Selector () } + app.device_ready = function(){ + accessibility.init(app.ready) // check if we can do native scrolling before build + } + app.ready = function(){ console.log(">> READY") + + app.bind() + app.build() + + app.iscroll_options = { + mouseWheel: true, + scrollbars: true, + disablePointer: is_android ? true : false, // important to disable the pointer events that causes the issues + disableTouch: false, // false if you want the slider to be usable with touch devices + disableMouse: false // false if you want the slider to be usable with a mouse (desktop) + } + if (window.cordova) { document.addEventListener('pause', app.paused, false) document.addEventListener('resume', app.resumed, false) diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/ArchiveView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/ArchiveView.js index f10f7744..92427b6f 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/ArchiveView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/ArchiveView.js @@ -58,10 +58,9 @@ var ArchiveView = ScrollableView.extend({ // id title images[ uri label code caption ] this.data.forEach(function(row, index){ - var t = this.menu_template.replace(/{{title}}/, row.title) var $t = $(t) - $t.data("aria-label", stonewash(row.title.replace(/'/g, " '").trim())) + $t.data("aria-label", stonewash(row.title.replace(/'0/g, " 20").replace(/'9/g, " 19").trim())) $t.data("title", row.title) $t.data("index", index) this.$menu_items.append($t) @@ -86,7 +85,7 @@ var ArchiveView = ScrollableView.extend({ var $t = $("
") $t.addClass("row").addClass("loading") var t = this.row_template.replace(/{{image}}/, cell.uri) - .replace(/{{label}}/, cell.label) + .replace(/{{label}}/g, cell.label) .replace(/{{code}}/, cell.code) .replace(/{{caption}}/, cell.caption) $t.html(t) diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/HubView.js index a0ee9dd0..d3b15f77 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/HubView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/HubView.js @@ -94,10 +94,18 @@ var HubView = ScrollableView.extend({ app.fullscreenViewer.show(url, url) }) $(".gallery-" + row.id).attr('aria-label', stonewash(row.title) + ". Image gallery, use the arrows to scroll.") + if (accessibility.voiceOver) { + $(".gallery-target-" + row.id).attr('aria-label', stonewash(row.title) + ". Image gallery, use the arrows to scroll.") + $(".gallery-target-" + row.id).click(function(e){ + e && e.preventDefault() + var url = gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"") + app.fullscreenViewer.show(url, url) + }) + } } else { // single image - var el = document.createElement("div") + var el = document.createElement(accessibility.voiceOver ? "a" : "div") if (row.image && row.image.length) { el.style.backgroundImage = "url(" + row.image[0].uri + ")" } @@ -112,16 +120,28 @@ var HubView = ScrollableView.extend({ $(".gallery-" + row.id).addClass("gallery-video-post") $(".gallery-" + row.id).attr('role', 'link') $(".gallery-" + row.id).attr('aria-label', stonewash(row.title) + ". Tap to watch the video on Youtube") + // $(".gallery-target-" + row.id).attr('aria-label', stonewash(row.title) + ". Tap to watch the video on Youtube") if (! row.image) { var url = row.link 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]; e.style.backgroundImage = "url(https://i.ytimg.com/vi/" + ytid + "/maxresdefault.jpg" } + // $(".gallery-target-" + row.id).click(function(e){ + // e && e.preventDefault() + // window.open(row.link, '_system') + // }) + $(".gallery-target-" + row.id).remove() } else { - $(el).click(function(){ + $(el).click(function(e){ + e && e.preventDefault() app.fullscreenViewer.show(row.image[0].uri) }) $(".gallery-" + row.id).attr('aria-label', stonewash(row.title) + ". Main image") + $(".gallery-target-" + row.id).attr('aria-label', stonewash(row.title) + ". Main image.") + $(".gallery-target-" + row.id).click(function(e){ + e && e.preventDefault() + app.fullscreenViewer.show(row.image[0].uri) + }) } $t.find(".gallery-left").remove() $t.find(".gallery-right").remove() diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/accessibility.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/accessibility.js index 8108e461..31ddaf23 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/accessibility.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/accessibility.js @@ -17,8 +17,10 @@ var accessibility = (function() { return ready() } if ('MobileAccessibility' in window) { + console.log('init accessibility') accessibility.build(ready) } else { + console.log('MobileAccessibility not found') ready() } } diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/FooterView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/FooterView.js index 8641668f..855c37bd 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/FooterView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/FooterView.js @@ -17,12 +17,14 @@ var FooterView = View.extend({ if (cancel) { this.$ok.removeClass("wide") this.$cancel.show().html(cancel) + this.$cancel.attr('aria-label', cancel.toLowerCase()) } else { this.$ok.addClass("wide") this.$cancel.hide() } this.$ok.html(ok) + this.$ok.attr('aria-label', ok.toLowerCase()) this.$el.show() }, diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/GalleryView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/GalleryView.js index d6f5723c..e84caa68 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/GalleryView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/GalleryView.js @@ -58,19 +58,40 @@ var GalleryView = View.extend({ draggable: true, }) - this.gallery.on('staticClick', function(e){ - var currentImage = gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"") + this.gallery.on('change', function(){ + var currentImage = this.gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"") var partz = currentImage.split("_") var head = partz[0] var size = partz[1] var tail = partz[2] var end_partz = tail.split(/\./) var style = end_partz[0] - var largest_size = large_styles[style] - var hiresImage = [head, largest_size, tail].join("_") - app.fullscreenViewer.show(currentImage, hiresImage) + var label = YOOX_IMAGE_STYLE_LABELS[style] || "Image: Alternate view" + $("#product .gallery-target").attr('aria-label', label) }) + + this.gallery.on('staticClick', this.static_click.bind(this)) + + if (accessibility.voiceOver) { + $("#product .gallery-target").click(this.static_click.bind(this)) + $("#product .gallery-target").attr('aria-label', "Image: Front view") + } else { + $("#product .gallery-target").remove() + } }, + static_click: function(e){ + var currentImage = this.gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"") + var partz = currentImage.split("_") + var head = partz[0] + var size = partz[1] + var tail = partz[2] + var end_partz = tail.split(/\./) + var style = end_partz[0] + var largest_size = large_styles[style] + var hiresImage = [head, largest_size, tail].join("_") + app.fullscreenViewer.show(currentImage, hiresImage) + }, + touchstart: function(e){ }, touchmove: function(e){ @@ -82,7 +103,7 @@ var GalleryView = View.extend({ var YOOX_IMAGE_STYLE_ORDER = "ZZZ f r d e a b c g l".split(" ") var YOOX_IMAGE_STYLE_LABELS = { - f: 'Front view', - r: 'Rear view', + f: 'Image: Front view', + r: 'Image: Rear view', } 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/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js index 62a6de18..f834b1c5 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js @@ -1,4 +1,3 @@ - var ProductView = ScrollableView.extend({ el: "#product", @@ -6,8 +5,10 @@ var ProductView = ScrollableView.extend({ events: { "click .fit": "scroll_to_bottom", "click .notAvailableInCanada": "scroll_to_bottom", - "click .size": "select_size", - "click .color": "select_color", + "change select[name=size]": "select_size", + "change select[name=color]": "select_color", + // "click .size": "select_size", + // "click .color": "select_color", "click .share": "share", "click .gallery-left": "gallery_left", "click .gallery-right": "gallery_right", @@ -22,8 +23,12 @@ var ProductView = ScrollableView.extend({ this.$type = this.$(".type") this.$price = this.$(".price") this.$size = this.$(".size") - this.$share = this.$(".share") + this.$sizeSelect = this.$(".size select") + this.$sizeLabel = this.$(".size .label") this.$color = this.$(".color") + this.$colorSelect = this.$(".color select") + this.$colorLabel = this.$(".color .label") + this.$share = this.$(".share") this.$body = this.$(".body") this.$fit = this.$(".fit") this.$fitHeader = this.$('.fitHeader') @@ -123,7 +128,7 @@ var ProductView = ScrollableView.extend({ var descriptions = this.get_descriptions(details) - var title = data['ModelNames'] + var title = data['ModelNames'] || "" var type = title_case( data['MicroCategory'] ) var price = "$" + data['DiscountedPrice'] + ".00" var details_description = descriptions['Details'] || "" @@ -132,7 +137,7 @@ var ProductView = ScrollableView.extend({ // body = body.replace(/
/g, "

").replace(/(
)+$/, "") var default_color_id = this.populate_selectors(data, details) - + var notAvailableInCanada = !! app.store.NotAvailableInCanada app.product.$notAvailableInCanada.toggle( notAvailableInCanada ) @@ -166,14 +171,8 @@ var ProductView = ScrollableView.extend({ this.size = size this.is_onesize = !! this.sizes[1] - - this.$size.show().html(size_label) - if (color_label) { - this.$color.html(color_label) - } - else { - this.$color.hide() - } + this.set_size_label(size_label) + this.set_color_label(color_label) } // console.log(color, color_label, size, size_label) @@ -233,6 +232,9 @@ var ProductView = ScrollableView.extend({ this.$sizing.hide() } + this.populate_sizes() + this.populate_colors() + this.deferScrollToTop() }, @@ -314,37 +316,74 @@ var ProductView = ScrollableView.extend({ return default_color }, - select_size: function(){ + populate_sizes: function() { + console.log(this.sold_out, this.notAvailable, this.is_onesize, this.item) if (this.sold_out) { return } if (this.notAvailable) { return } - if (this.is_onesize) { return this.select_color() } - if (this.item['Sizes'].length == 0) { return } - var sizes = Object.keys(this.sizes).map(function(key){ - return this.sizes[key] - }.bind(this)) - - app.selector.select("style", sizes, function(size){ - console.log(size) - this.size = size.value - this.$size.html(size.label) + // if (this.is_onesize) { return this.select_color() } + if (this.details['ModelSizes'].length == 0) { return } + + this.$sizeSelect.empty() + var sizes = Object.keys(this.sizes).forEach(function(key){ + var size = this.sizes[key] + var option = document.createElement('option') + option.value = size.value + option.innerHTML = size.label + this.$sizeSelect.append(option) }.bind(this)) }, - - select_color: function(){ + + populate_colors: function() { if (this.sold_out) { return } if (this.notAvailable) { return } - if (this.item['Colors'].length == 0) { return } - var colors = Object.keys(this.colors).map(function(key){ - return this.colors[key] - }.bind(this)) - app.selector.select("style", colors, function(color){ - this.code = color.code - this.$color.html(color.label) - this.gallery.populate( color.code, this.details['ImageTypes'] ) - this.gallery_right() + if (this.details['ModelColors'].length == 0) { return } + + this.$colorSelect.empty() + Object.keys(this.colors).forEach(function(key){ + var color = this.colors[key] + var option = document.createElement('option') + option.value = key + option.innerHTML = color.label + this.$colorSelect.append(option) }.bind(this)) }, + select_size: function(){ + console.log(this.colors) + var value = this.$sizeSelect.val() + var size = this.sizes[value] + console.log(size) + this.set_size_label(size.label) + this.size = size.value + }, + + select_color: function(){ + var value = this.$colorSelect.val() + var color = this.colors[value] + console.log(color) + this.code = color.code + this.set_color_label(color.label) + this.gallery.populate( color.code, this.details['ImageTypes'] ) + this.gallery_right() + }, + + set_size_label: function(size_label){ + this.$size.show() + this.$sizeLabel.html(size_label) + this.$size.attr('aria-label', 'Tap to select size. Current size: ' + size_label) + }, + + set_color_label: function(color_label){ + if (color_label) { + this.$color.show() + this.$colorLabel.html(color_label) + this.$color.attr('aria-label', 'Tap to select color. Current color: ' + color_label) + } + else { + this.$color.hide() + } + }, + // ADD TO CART save: function(){ if (this.sold_out) { return } diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/vendor/util.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/vendor/util.js index 27bdf008..c44dda79 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/vendor/util.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/vendor/util.js @@ -25,7 +25,7 @@ function hex_string (rgb) { return "#" + rgb.map(Math.round).map(function(n){ va function parse_rgba_string (s) { return s.match(/(\d+)/g).slice(0,3) } function title_case (str) { - return str.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();}); + return (str || "").replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();}); } function pluralize (n,s,ss) { return n + " " + s + ( n == 1 ? "" : (ss || "s") ) } function as_cash(n){ diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist index 4dadab85..605e51b3 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,7 +12,7 @@ Stone Island.xcscheme_^#shared#^_ orderHint - 2 + 3 diff --git a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate index 2156bf4f..d4c3c9bd 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate and b/StoneIsland/platforms/ios/Stone Island.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 2f55165d..aa7b8366 100644 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.2.3 + 1.2.4 CFBundleSignature ???? CFBundleURLTypes @@ -34,7 +34,7 @@ CFBundleVersion - 1.2.3 + 1.2.4 GCM_SENDER_ID 85075801930 IS_GCM_ENABLED diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index 727ea16c..4368e5b6 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/ios.json b/StoneIsland/platforms/ios/ios.json index 037d3c69..13984298 100644 --- a/StoneIsland/platforms/ios/ios.json +++ b/StoneIsland/platforms/ios/ios.json @@ -356,4 +356,4 @@ "cordova-plugin-sim": "1.3.3", "phonegap-plugin-mobile-accessibility": "1.0.5-dev" } -} +} \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/css/blogs.css b/StoneIsland/platforms/ios/www/css/blogs.css index f857db9e..c4b74c19 100755 --- a/StoneIsland/platforms/ios/www/css/blogs.css +++ b/StoneIsland/platforms/ios/www/css/blogs.css @@ -186,6 +186,9 @@ height:100px; box-sizing:border-box } +.vscroll .fade-cover { + display: none; +} /* .fade-cover::before { @@ -264,6 +267,13 @@ ul.links { transform-origin: 50% 50%; transform: translateZ(0) translateX(-50%) translateY(-50%); } +#archive .menu { + position: fixed; + display: none; +} +#archive.menu .menu { + display: block; +} .accessible #archive .row .image, .accessible #archive .row .text { @@ -353,6 +363,16 @@ ul.links { width: 90%; } +.gallery-target { + display: none; +} +.accessible .gallery-target { + display: block; + position: absolute; + top: 0; left: 0; + width: 100vw; + height: 52vh; +} .gallery-video-post { position:relative; } diff --git a/StoneIsland/platforms/ios/www/css/products.css b/StoneIsland/platforms/ios/www/css/products.css index 63e9b020..e15e0e54 100755 --- a/StoneIsland/platforms/ios/www/css/products.css +++ b/StoneIsland/platforms/ios/www/css/products.css @@ -55,6 +55,7 @@ } .gallery .item { + display: block; width: 100vw; height: 52vh; background-size: contain; @@ -93,6 +94,11 @@ text-align: center; width: 100%; } +#closed .closed_target { + position: absolute; + top: 0; left: 0; + width: 100%; height: 100%; +} .product .content { box-sizing:border-box; @@ -160,19 +166,31 @@ display: flex; flex-direction: row; } -.product .size-color span { - position:relative; - box-sizing:border-box; - padding: 0 12px; +.product .size-color > div { + position: relative; + box-sizing: border-box; height: 48px; font-size: 1rem; display: flex; justify-content: center; align-items: center; } -.product .size-color span.size { +.product .size-color > div > div.label { + padding: 0 12px; + max-width: 6rem; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.product .size-color div.size { border-right: 1px solid #444; } +.product .size-color > div > select { + position: absolute; + top: 0; left: 0; + width: 100%; height: 100%; + opacity: 0; +} .product .price { display:table-cell; diff --git a/StoneIsland/platforms/ios/www/db.json b/StoneIsland/platforms/ios/www/db.json index 8b9d322c..7bffd341 100644 --- a/StoneIsland/platforms/ios/www/db.json +++ b/StoneIsland/platforms/ios/www/db.json @@ -4838,7 +4838,7 @@ "Departments": [ { "text": "Test", - "uri": "ctsjckts" + "uri": "PPPRVWFWSC1" } ], "StoreStatus": "closed", diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index eaae059a..a422832c 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -138,10 +138,11 @@
+
@@ -325,11 +327,17 @@
- - +
+
+ +
+
+
+ +
- +
Fits Large
@@ -346,15 +354,16 @@
+

LOADING THE STORE, PLEASE WAIT

-
+
visit
- www.stoneisland.com + www.stoneisland.com
@@ -1359,8 +1368,8 @@ - + diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js index b90f74b1..42cec6f1 100755 --- a/StoneIsland/platforms/ios/www/js/index.js +++ b/StoneIsland/platforms/ios/www/js/index.js @@ -12,26 +12,11 @@ var app = (function(){ sdk.init({ env: "production" }) } - accessibility.init(app.prebuild) // check if we can do native scrolling before build - } - - app.prebuild = function(){ - app.bind() - app.build() - - app.iscroll_options = { - mouseWheel: true, - scrollbars: true, - disablePointer: is_android ? true : false, // important to disable the pointer events that causes the issues - disableTouch: false, // false if you want the slider to be usable with touch devices - disableMouse: false // false if you want the slider to be usable with a mouse (desktop) - } - if (window.cordova) { - document.addEventListener('deviceready', app.ready, false) + document.addEventListener('deviceready', app.device_ready, false) } else { - app.ready() + app.device_ready() } } @@ -77,8 +62,24 @@ var app = (function(){ app.selector = new Selector () } + app.device_ready = function(){ + accessibility.init(app.ready) // check if we can do native scrolling before build + } + app.ready = function(){ console.log(">> READY") + + app.bind() + app.build() + + app.iscroll_options = { + mouseWheel: true, + scrollbars: true, + disablePointer: is_android ? true : false, // important to disable the pointer events that causes the issues + disableTouch: false, // false if you want the slider to be usable with touch devices + disableMouse: false // false if you want the slider to be usable with a mouse (desktop) + } + if (window.cordova) { document.addEventListener('pause', app.paused, false) document.addEventListener('resume', app.resumed, false) diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js index f10f7744..92427b6f 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js @@ -58,10 +58,9 @@ var ArchiveView = ScrollableView.extend({ // id title images[ uri label code caption ] this.data.forEach(function(row, index){ - var t = this.menu_template.replace(/{{title}}/, row.title) var $t = $(t) - $t.data("aria-label", stonewash(row.title.replace(/'/g, " '").trim())) + $t.data("aria-label", stonewash(row.title.replace(/'0/g, " 20").replace(/'9/g, " 19").trim())) $t.data("title", row.title) $t.data("index", index) this.$menu_items.append($t) @@ -86,7 +85,7 @@ var ArchiveView = ScrollableView.extend({ var $t = $("
") $t.addClass("row").addClass("loading") var t = this.row_template.replace(/{{image}}/, cell.uri) - .replace(/{{label}}/, cell.label) + .replace(/{{label}}/g, cell.label) .replace(/{{code}}/, cell.code) .replace(/{{caption}}/, cell.caption) $t.html(t) diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js index a0ee9dd0..d3b15f77 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js @@ -94,10 +94,18 @@ var HubView = ScrollableView.extend({ app.fullscreenViewer.show(url, url) }) $(".gallery-" + row.id).attr('aria-label', stonewash(row.title) + ". Image gallery, use the arrows to scroll.") + if (accessibility.voiceOver) { + $(".gallery-target-" + row.id).attr('aria-label', stonewash(row.title) + ". Image gallery, use the arrows to scroll.") + $(".gallery-target-" + row.id).click(function(e){ + e && e.preventDefault() + var url = gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"") + app.fullscreenViewer.show(url, url) + }) + } } else { // single image - var el = document.createElement("div") + var el = document.createElement(accessibility.voiceOver ? "a" : "div") if (row.image && row.image.length) { el.style.backgroundImage = "url(" + row.image[0].uri + ")" } @@ -112,16 +120,28 @@ var HubView = ScrollableView.extend({ $(".gallery-" + row.id).addClass("gallery-video-post") $(".gallery-" + row.id).attr('role', 'link') $(".gallery-" + row.id).attr('aria-label', stonewash(row.title) + ". Tap to watch the video on Youtube") + // $(".gallery-target-" + row.id).attr('aria-label', stonewash(row.title) + ". Tap to watch the video on Youtube") if (! row.image) { var url = row.link 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]; e.style.backgroundImage = "url(https://i.ytimg.com/vi/" + ytid + "/maxresdefault.jpg" } + // $(".gallery-target-" + row.id).click(function(e){ + // e && e.preventDefault() + // window.open(row.link, '_system') + // }) + $(".gallery-target-" + row.id).remove() } else { - $(el).click(function(){ + $(el).click(function(e){ + e && e.preventDefault() app.fullscreenViewer.show(row.image[0].uri) }) $(".gallery-" + row.id).attr('aria-label', stonewash(row.title) + ". Main image") + $(".gallery-target-" + row.id).attr('aria-label', stonewash(row.title) + ". Main image.") + $(".gallery-target-" + row.id).click(function(e){ + e && e.preventDefault() + app.fullscreenViewer.show(row.image[0].uri) + }) } $t.find(".gallery-left").remove() $t.find(".gallery-right").remove() diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/accessibility.js b/StoneIsland/platforms/ios/www/js/lib/etc/accessibility.js index 8108e461..31ddaf23 100644 --- a/StoneIsland/platforms/ios/www/js/lib/etc/accessibility.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/accessibility.js @@ -17,8 +17,10 @@ var accessibility = (function() { return ready() } if ('MobileAccessibility' in window) { + console.log('init accessibility') accessibility.build(ready) } else { + console.log('MobileAccessibility not found') ready() } } diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/FooterView.js b/StoneIsland/platforms/ios/www/js/lib/nav/FooterView.js index 8641668f..855c37bd 100755 --- a/StoneIsland/platforms/ios/www/js/lib/nav/FooterView.js +++ b/StoneIsland/platforms/ios/www/js/lib/nav/FooterView.js @@ -17,12 +17,14 @@ var FooterView = View.extend({ if (cancel) { this.$ok.removeClass("wide") this.$cancel.show().html(cancel) + this.$cancel.attr('aria-label', cancel.toLowerCase()) } else { this.$ok.addClass("wide") this.$cancel.hide() } this.$ok.html(ok) + this.$ok.attr('aria-label', ok.toLowerCase()) this.$el.show() }, diff --git a/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js b/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js index d6f5723c..e84caa68 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js @@ -58,19 +58,40 @@ var GalleryView = View.extend({ draggable: true, }) - this.gallery.on('staticClick', function(e){ - var currentImage = gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"") + this.gallery.on('change', function(){ + var currentImage = this.gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"") var partz = currentImage.split("_") var head = partz[0] var size = partz[1] var tail = partz[2] var end_partz = tail.split(/\./) var style = end_partz[0] - var largest_size = large_styles[style] - var hiresImage = [head, largest_size, tail].join("_") - app.fullscreenViewer.show(currentImage, hiresImage) + var label = YOOX_IMAGE_STYLE_LABELS[style] || "Image: Alternate view" + $("#product .gallery-target").attr('aria-label', label) }) + + this.gallery.on('staticClick', this.static_click.bind(this)) + + if (accessibility.voiceOver) { + $("#product .gallery-target").click(this.static_click.bind(this)) + $("#product .gallery-target").attr('aria-label', "Image: Front view") + } else { + $("#product .gallery-target").remove() + } }, + static_click: function(e){ + var currentImage = this.gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"") + var partz = currentImage.split("_") + var head = partz[0] + var size = partz[1] + var tail = partz[2] + var end_partz = tail.split(/\./) + var style = end_partz[0] + var largest_size = large_styles[style] + var hiresImage = [head, largest_size, tail].join("_") + app.fullscreenViewer.show(currentImage, hiresImage) + }, + touchstart: function(e){ }, touchmove: function(e){ @@ -82,7 +103,7 @@ var GalleryView = View.extend({ var YOOX_IMAGE_STYLE_ORDER = "ZZZ f r d e a b c g l".split(" ") var YOOX_IMAGE_STYLE_LABELS = { - f: 'Front view', - r: 'Rear view', + f: 'Image: Front view', + r: 'Image: Rear view', } 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/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js index 62a6de18..f834b1c5 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js @@ -1,4 +1,3 @@ - var ProductView = ScrollableView.extend({ el: "#product", @@ -6,8 +5,10 @@ var ProductView = ScrollableView.extend({ events: { "click .fit": "scroll_to_bottom", "click .notAvailableInCanada": "scroll_to_bottom", - "click .size": "select_size", - "click .color": "select_color", + "change select[name=size]": "select_size", + "change select[name=color]": "select_color", + // "click .size": "select_size", + // "click .color": "select_color", "click .share": "share", "click .gallery-left": "gallery_left", "click .gallery-right": "gallery_right", @@ -22,8 +23,12 @@ var ProductView = ScrollableView.extend({ this.$type = this.$(".type") this.$price = this.$(".price") this.$size = this.$(".size") - this.$share = this.$(".share") + this.$sizeSelect = this.$(".size select") + this.$sizeLabel = this.$(".size .label") this.$color = this.$(".color") + this.$colorSelect = this.$(".color select") + this.$colorLabel = this.$(".color .label") + this.$share = this.$(".share") this.$body = this.$(".body") this.$fit = this.$(".fit") this.$fitHeader = this.$('.fitHeader') @@ -123,7 +128,7 @@ var ProductView = ScrollableView.extend({ var descriptions = this.get_descriptions(details) - var title = data['ModelNames'] + var title = data['ModelNames'] || "" var type = title_case( data['MicroCategory'] ) var price = "$" + data['DiscountedPrice'] + ".00" var details_description = descriptions['Details'] || "" @@ -132,7 +137,7 @@ var ProductView = ScrollableView.extend({ // body = body.replace(/
/g, "

").replace(/(
)+$/, "") var default_color_id = this.populate_selectors(data, details) - + var notAvailableInCanada = !! app.store.NotAvailableInCanada app.product.$notAvailableInCanada.toggle( notAvailableInCanada ) @@ -166,14 +171,8 @@ var ProductView = ScrollableView.extend({ this.size = size this.is_onesize = !! this.sizes[1] - - this.$size.show().html(size_label) - if (color_label) { - this.$color.html(color_label) - } - else { - this.$color.hide() - } + this.set_size_label(size_label) + this.set_color_label(color_label) } // console.log(color, color_label, size, size_label) @@ -233,6 +232,9 @@ var ProductView = ScrollableView.extend({ this.$sizing.hide() } + this.populate_sizes() + this.populate_colors() + this.deferScrollToTop() }, @@ -314,37 +316,74 @@ var ProductView = ScrollableView.extend({ return default_color }, - select_size: function(){ + populate_sizes: function() { + console.log(this.sold_out, this.notAvailable, this.is_onesize, this.item) if (this.sold_out) { return } if (this.notAvailable) { return } - if (this.is_onesize) { return this.select_color() } - if (this.item['Sizes'].length == 0) { return } - var sizes = Object.keys(this.sizes).map(function(key){ - return this.sizes[key] - }.bind(this)) - - app.selector.select("style", sizes, function(size){ - console.log(size) - this.size = size.value - this.$size.html(size.label) + // if (this.is_onesize) { return this.select_color() } + if (this.details['ModelSizes'].length == 0) { return } + + this.$sizeSelect.empty() + var sizes = Object.keys(this.sizes).forEach(function(key){ + var size = this.sizes[key] + var option = document.createElement('option') + option.value = size.value + option.innerHTML = size.label + this.$sizeSelect.append(option) }.bind(this)) }, - - select_color: function(){ + + populate_colors: function() { if (this.sold_out) { return } if (this.notAvailable) { return } - if (this.item['Colors'].length == 0) { return } - var colors = Object.keys(this.colors).map(function(key){ - return this.colors[key] - }.bind(this)) - app.selector.select("style", colors, function(color){ - this.code = color.code - this.$color.html(color.label) - this.gallery.populate( color.code, this.details['ImageTypes'] ) - this.gallery_right() + if (this.details['ModelColors'].length == 0) { return } + + this.$colorSelect.empty() + Object.keys(this.colors).forEach(function(key){ + var color = this.colors[key] + var option = document.createElement('option') + option.value = key + option.innerHTML = color.label + this.$colorSelect.append(option) }.bind(this)) }, + select_size: function(){ + console.log(this.colors) + var value = this.$sizeSelect.val() + var size = this.sizes[value] + console.log(size) + this.set_size_label(size.label) + this.size = size.value + }, + + select_color: function(){ + var value = this.$colorSelect.val() + var color = this.colors[value] + console.log(color) + this.code = color.code + this.set_color_label(color.label) + this.gallery.populate( color.code, this.details['ImageTypes'] ) + this.gallery_right() + }, + + set_size_label: function(size_label){ + this.$size.show() + this.$sizeLabel.html(size_label) + this.$size.attr('aria-label', 'Tap to select size. Current size: ' + size_label) + }, + + set_color_label: function(color_label){ + if (color_label) { + this.$color.show() + this.$colorLabel.html(color_label) + this.$color.attr('aria-label', 'Tap to select color. Current color: ' + color_label) + } + else { + this.$color.hide() + } + }, + // ADD TO CART save: function(){ if (this.sold_out) { return } diff --git a/StoneIsland/platforms/ios/www/js/vendor/util.js b/StoneIsland/platforms/ios/www/js/vendor/util.js index 27bdf008..c44dda79 100755 --- a/StoneIsland/platforms/ios/www/js/vendor/util.js +++ b/StoneIsland/platforms/ios/www/js/vendor/util.js @@ -25,7 +25,7 @@ function hex_string (rgb) { return "#" + rgb.map(Math.round).map(function(n){ va function parse_rgba_string (s) { return s.match(/(\d+)/g).slice(0,3) } function title_case (str) { - return str.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();}); + return (str || "").replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();}); } function pluralize (n,s,ss) { return n + " " + s + ( n == 1 ? "" : (ss || "s") ) } function as_cash(n){ -- cgit v1.2.3-70-g09d2