From 05abca52782442dacb06d98f8433c0a8666b4e55 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 3 May 2018 00:45:40 +0200 Subject: app --- .../ios/Stone Island.xcarchive/Info.plist | 2 +- .../Applications/Stone Island.app/Assets.car | Bin 844136 -> 844136 bytes .../01J-lp-oVM-view-Ze5-6b-2t3.nib | Bin 2284 -> 2282 bytes .../UIViewController-01J-lp-oVM.nib | Bin 832 -> 832 bytes .../Stone Island.app/MainViewController.nib | Bin 943 -> 943 bytes .../Applications/Stone Island.app/Stone Island | Bin 2224192 -> 2224192 bytes .../Stone Island.app/_CodeSignature/CodeResources | 36 ++++++++++----------- .../www/css/vendor/imageviewer.css | 4 +-- .../Stone Island.app/www/js/vendor/imageviewer.js | 3 ++ .../platforms/ios/www/css/vendor/imageviewer.css | 4 +-- .../platforms/ios/www/js/vendor/imageviewer.js | 3 ++ StoneIsland/www/css/vendor/imageviewer.css | 4 +-- StoneIsland/www/js/lib/blogs/BlogView.js | 4 ++- StoneIsland/www/js/lib/blogs/HubView.js | 2 +- StoneIsland/www/js/lib/products/GalleryView.js | 30 ++++++++--------- StoneIsland/www/js/vendor/imageviewer.js | 3 ++ 16 files changed, 53 insertions(+), 42 deletions(-) (limited to 'StoneIsland') diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 62407c24..6376f422 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -18,7 +18,7 @@ ArchiveVersion 2 CreationDate - 2018-04-30T23:27:33Z + 2018-05-02T22:10:00Z 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 e6e9fdf9..9a76fff8 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 14c086b8..c733b5ac 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 6b717790..5505f5f5 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/MainViewController.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib index 6f0531ef..d5cba035 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 03e990cb..b51d09de 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 aac3b0c6..50cadfe3 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 - X77iqOSfOBq++C6Ofab9TwKX/H0= + tszeoGh05zy+6mIi3uhQTDuyGl4= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - /NkqnV08SFpdht+bv/Nrq3IAU5g= + 3kENpZV04BY77IF9fdI492Ejcsw= CDVLaunchScreen.storyboardc/Info.plist @@ -106,7 +106,7 @@ CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - 8FbiZcGKTwdXrAFb+uYT7V09mMY= + mhvCTFFXlxaLrmgLmrDZ+1ysqcQ= CDVNotification.bundle/beep.wav @@ -118,7 +118,7 @@ MainViewController.nib - +0H2odfEEAoVXh614tgP3WJFEyQ= + BRzL+0NY/MDviGcrgPkKilkjmYw= PkgInfo @@ -238,7 +238,7 @@ www/css/vendor/imageviewer.css - Y0TTtdmiVpKxiVlsmRZpO1oaw3k= + U9IUnW7ZX4TgGTq33Seu9eZgogE= www/db.json @@ -586,7 +586,7 @@ www/js/vendor/imageviewer.js - dDUe+v7hMXHgtHs7CrXPQ/YdDTw= + +lvb1hPF4rBrUNXOYaIPTnT7yok= www/js/vendor/iscroll.js @@ -941,22 +941,22 @@ hash - X77iqOSfOBq++C6Ofab9TwKX/H0= + tszeoGh05zy+6mIi3uhQTDuyGl4= hash2 - Q1t27cNvHm/fCaaMaugEPCJALXHbidwqtiLKHPCPl2I= + TXWLbTBHSTbsS/QoivSVU3Axfjow+6KtNCflCxcoYeQ= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib hash - /NkqnV08SFpdht+bv/Nrq3IAU5g= + 3kENpZV04BY77IF9fdI492Ejcsw= hash2 - 7Ab68SyMh60EY5PT/eeqd55fvOucen9u1AU1t5mRMHU= + sqLN533a8SMMDopbnpIYbPvAZkC2eSDoNYA+vGhZA54= CDVLaunchScreen.storyboardc/Info.plist @@ -974,11 +974,11 @@ hash - 8FbiZcGKTwdXrAFb+uYT7V09mMY= + mhvCTFFXlxaLrmgLmrDZ+1ysqcQ= hash2 - v6smnmSXyxCxE5o3pWdIuV9eO/y/mka1lIF/ISjNwrQ= + ijE8+ot5dTiTWgsPT8NbPgEDhXd75F1NnY6JLXXmsGU= CDVNotification.bundle/beep.wav @@ -996,11 +996,11 @@ hash - +0H2odfEEAoVXh614tgP3WJFEyQ= + BRzL+0NY/MDviGcrgPkKilkjmYw= hash2 - S+9UoNvi55BvadYZImx9LGTVbaZsyJGecuCFuhd3Z88= + zM+nLFEC7j9jraALjenv2omieTkmkRk6D9+mBarES0M= config.xml @@ -1315,11 +1315,11 @@ hash - Y0TTtdmiVpKxiVlsmRZpO1oaw3k= + U9IUnW7ZX4TgGTq33Seu9eZgogE= hash2 - /7LafZ9alRQNgfO5nCCnwOI7MoSVDHa0RRK1jlJ3XbU= + JN5niSdpAtWf/qLG3j5+Cp9UbBc3SZAmhql6sUDsYm0= www/db.json @@ -2272,11 +2272,11 @@ hash - dDUe+v7hMXHgtHs7CrXPQ/YdDTw= + +lvb1hPF4rBrUNXOYaIPTnT7yok= hash2 - f118cn4Nx3NHL5Bvo0THTOOppi9P4rP0W/6S+m4k24o= + vnIzT6qSefpXefYDH2WXGOkv8wUApSxo6xw2EVQdU44= www/js/vendor/iscroll.js diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/vendor/imageviewer.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/vendor/imageviewer.css index 9ce0d82b..af346f08 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/vendor/imageviewer.css +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/vendor/imageviewer.css @@ -70,7 +70,6 @@ } *//***** snap view css *****/ .iv-snap-view { - display: none !important; width: 150px; height: 150px; position: absolute; @@ -86,7 +85,8 @@ -moz-transition: all ease 400ms; -o-transition: all ease 400ms; transition: all ease 400ms; - opacity: 0; + opacity: 0 !important; + pointer-events: none; } .iv-snap-image-wrap { diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/vendor/imageviewer.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/vendor/imageviewer.js index 4484b753..847c6070 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/vendor/imageviewer.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/vendor/imageviewer.js @@ -404,6 +404,9 @@ var touchtime = 0, point; imageWrap.on('click' + eventSuffix, function (e) { + if (openTime+700 < Date.now()) { + return $('.iv-close').trigger("click") + } if (touchtime == 0) { touchtime = Date.now(); point = { diff --git a/StoneIsland/platforms/ios/www/css/vendor/imageviewer.css b/StoneIsland/platforms/ios/www/css/vendor/imageviewer.css index 9ce0d82b..af346f08 100644 --- a/StoneIsland/platforms/ios/www/css/vendor/imageviewer.css +++ b/StoneIsland/platforms/ios/www/css/vendor/imageviewer.css @@ -70,7 +70,6 @@ } *//***** snap view css *****/ .iv-snap-view { - display: none !important; width: 150px; height: 150px; position: absolute; @@ -86,7 +85,8 @@ -moz-transition: all ease 400ms; -o-transition: all ease 400ms; transition: all ease 400ms; - opacity: 0; + opacity: 0 !important; + pointer-events: none; } .iv-snap-image-wrap { diff --git a/StoneIsland/platforms/ios/www/js/vendor/imageviewer.js b/StoneIsland/platforms/ios/www/js/vendor/imageviewer.js index 4484b753..847c6070 100644 --- a/StoneIsland/platforms/ios/www/js/vendor/imageviewer.js +++ b/StoneIsland/platforms/ios/www/js/vendor/imageviewer.js @@ -404,6 +404,9 @@ var touchtime = 0, point; imageWrap.on('click' + eventSuffix, function (e) { + if (openTime+700 < Date.now()) { + return $('.iv-close').trigger("click") + } if (touchtime == 0) { touchtime = Date.now(); point = { diff --git a/StoneIsland/www/css/vendor/imageviewer.css b/StoneIsland/www/css/vendor/imageviewer.css index 9ce0d82b..af346f08 100644 --- a/StoneIsland/www/css/vendor/imageviewer.css +++ b/StoneIsland/www/css/vendor/imageviewer.css @@ -70,7 +70,6 @@ } *//***** snap view css *****/ .iv-snap-view { - display: none !important; width: 150px; height: 150px; position: absolute; @@ -86,7 +85,8 @@ -moz-transition: all ease 400ms; -o-transition: all ease 400ms; transition: all ease 400ms; - opacity: 0; + opacity: 0 !important; + pointer-events: none; } .iv-snap-image-wrap { diff --git a/StoneIsland/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js index 55320e7c..ed17e684 100755 --- a/StoneIsland/www/js/lib/blogs/BlogView.js +++ b/StoneIsland/www/js/lib/blogs/BlogView.js @@ -92,13 +92,15 @@ var BlogView = View.extend({ console.log(app.store.StoreStatus) + console.log(app.store.FitsLarge, app.store.fitsLargeText) app.product.fitLargeCodes = {} if (app.store.FittingCodes.length) { app.store.FittingCodes.split("\n").forEach(function(code){ app.product.fitLargeCodes[code] = true }) + console.log(app.store.FitsLarge, app.store.fitsLargeText) if (app.store.FitsLarge === 'use_alt_text' && (app.store.FitsLargeText || "").length) { - var fit_lines = app.store.FitsLargeText.split('\n').replace(//g, "&rt;").join("
") + var fit_lines = app.store.FitsLargeText.replace(//g, "&rt;").split('\n').join("
") $('.fit').html(fit_lines) $('.fit').addClass('altText') } diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js index c09dd3b3..5e2ff67e 100755 --- a/StoneIsland/www/js/lib/blogs/HubView.js +++ b/StoneIsland/www/js/lib/blogs/HubView.js @@ -183,7 +183,7 @@ var HubLoader = (function(){ HubLoader.build = function(){ view.append(item) view.scroller.refresh() - if (count < 20 && ! needed) return + if (count < 2 && ! needed) return // if (count === 10) return setTimeout(HubLoader.load, count < 10 ? 1000 : 5000) } diff --git a/StoneIsland/www/js/lib/products/GalleryView.js b/StoneIsland/www/js/lib/products/GalleryView.js index 0c928739..0acd48c5 100755 --- a/StoneIsland/www/js/lib/products/GalleryView.js +++ b/StoneIsland/www/js/lib/products/GalleryView.js @@ -9,7 +9,6 @@ var GalleryView = View.extend({ // "touchstart .gallery": "touchstart", // "touchmove .gallery": "touchmove", // "touchend .gallery": "touchend", - "click": "click", }, initialize: function(){ @@ -23,7 +22,7 @@ var GalleryView = View.extend({ populate: function(code, image_ids){ var valid_styles = {} - var large_styles = this.large_styles = {} + var large_styles = {} image_ids.forEach(function(id){ if (id.indexOf("_") == -1) return var partz = id.split("_") @@ -44,7 +43,7 @@ var GalleryView = View.extend({ this.$el.append(t) }.bind(this)) - this.gallery = new Flickity( "#gallery", { + var gallery = this.gallery = new Flickity( "#gallery", { selector: '.item', cellAlign: 'center', autoPlay: false, @@ -56,18 +55,19 @@ var GalleryView = View.extend({ contain: true, draggable: true, }) - }, - 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 = this.large_styles[style] - var hiresImage = [head, largest_size, tail].join("_") - app.fullscreenViewer.show(currentImage, hiresImage) + + this.gallery.on('staticClick', function(e){ + var currentImage = 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){ }, diff --git a/StoneIsland/www/js/vendor/imageviewer.js b/StoneIsland/www/js/vendor/imageviewer.js index 4484b753..847c6070 100644 --- a/StoneIsland/www/js/vendor/imageviewer.js +++ b/StoneIsland/www/js/vendor/imageviewer.js @@ -404,6 +404,9 @@ var touchtime = 0, point; imageWrap.on('click' + eventSuffix, function (e) { + if (openTime+700 < Date.now()) { + return $('.iv-close').trigger("click") + } if (touchtime == 0) { touchtime = Date.now(); point = { -- cgit v1.2.3-70-g09d2