From 76df508468975b9ffdd47373e5a406e21ac8cfdf Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 8 Jun 2018 01:17:29 +0200 Subject: mauh --- .../xcschemes/xcschememanagement.plist | 2 +- .../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 -> 2283 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 | 30 ++++++++++----------- .../www/js/lib/products/ProductView.js | 17 ++++++------ .../xcschemes/xcschememanagement.plist | 2 +- .../UserInterfaceState.xcuserstate | Bin 25200 -> 25263 bytes .../ios/www/js/lib/products/ProductView.js | 17 ++++++------ 12 files changed, 36 insertions(+), 34 deletions(-) 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 54b0db05..daa4d171 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 @@ -12,7 +12,7 @@ CordovaLib.xcscheme orderHint - 3 + 2 diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 822ae7b4..59396e5b 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-05-11T16:37:02Z + 2018-06-07T14:13:12Z 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 8d09afe3..503630f3 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 03508bdf..435bc4a5 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 de0a186b..0e9ee2cc 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 cad52f04..3cd81fe0 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 f99532ad..83e0cbfd 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 4acc44e3..c1fea8e8 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 - GN2nb+g/cHX8bnm2ecz16Sra+nc= + J0A+o1ndokPaM9LIbaY3RCU2OSY= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - aabcMTBlmk/hXoso7hD09VPsBio= + r6EFHh5xw3jmobvUq9ENT1G9LJQ= CDVLaunchScreen.storyboardc/Info.plist @@ -106,7 +106,7 @@ CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - CggX5ov/zL2mrIaWW24kXthuu2k= + IF5ajdY1B0/fl2fXzBH6/hrivIA= CDVNotification.bundle/beep.wav @@ -118,7 +118,7 @@ MainViewController.nib - Py1vsWb79R9BWyFZnv3kd3jJ0TU= + 7Y1YDVWwPWU4Wl1BhmyY6OWFsqs= PkgInfo @@ -506,7 +506,7 @@ www/js/lib/products/ProductView.js - jftXU0zGMaj1mxbmp15NfN7qh2w= + OvyCvqKno4Hvm5R6fcB5SHDfj+s= www/js/lib/products/Selector.js @@ -937,22 +937,22 @@ hash - GN2nb+g/cHX8bnm2ecz16Sra+nc= + J0A+o1ndokPaM9LIbaY3RCU2OSY= hash2 - Hbx6owpnbS3cLwPzGi5638Cw006jgGSMvWkHb1eAvIg= + GLa3sHmjn0+6qtOG3b5hCRufe6dXS/pj4z2mQwl0ioo= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib hash - aabcMTBlmk/hXoso7hD09VPsBio= + r6EFHh5xw3jmobvUq9ENT1G9LJQ= hash2 - C5Dh7BZYEqwKlYSbHY9prPiOLND5dHgdlUWHnfj/JH8= + NGG5cppBU+WBlPIWqDloWwHSvsjF7wVowKH7G0AUk5Q= CDVLaunchScreen.storyboardc/Info.plist @@ -970,11 +970,11 @@ hash - CggX5ov/zL2mrIaWW24kXthuu2k= + IF5ajdY1B0/fl2fXzBH6/hrivIA= hash2 - MumZ0aQWkzPxBWZFNOo6+gRBa/opbiddZJBaHSdwbYs= + 8ErfbY5UjOdvrwZv3pNySOs9sLbEbPVdWe6XvcSGgQQ= CDVNotification.bundle/beep.wav @@ -992,11 +992,11 @@ hash - Py1vsWb79R9BWyFZnv3kd3jJ0TU= + 7Y1YDVWwPWU4Wl1BhmyY6OWFsqs= hash2 - bLEpCWPmKykSMk2BhmSPgQe8wtEdo/4oC7JJhySbt+M= + XpZbKB4l2DRJTTMzveU/XYRObkDwDN+Szzj6U2r5RN8= config.xml @@ -2048,11 +2048,11 @@ hash - jftXU0zGMaj1mxbmp15NfN7qh2w= + OvyCvqKno4Hvm5R6fcB5SHDfj+s= hash2 - kYrw23DCTnoWYOZzove5yMixrTDBBWvFFrtdd14AemU= + d0gYTwzKDGmRJ6k+2KgDNMGQbsYiqJFK3ZijApq0GaM= www/js/lib/products/Selector.js 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 0ad58acc..3bcf5ee4 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 @@ -217,18 +217,19 @@ var ProductView = ScrollableView.extend({ else { this.$fitHeader.hide() } + this.$fit.show() + + if (app.store.SizingFooter === 'use_alt_text' && (app.store.SizingFooterText || "").length) { + var sizing_lines = app.store.SizingFooterText.replace(//g, "&rt;").split('\n').join("
") + this.$sizing.html(sizing_lines) + this.$sizing.show() + } else if (app.store.SizingFooter === 'true') { + this.$sizing.show() + } } else { this.$fitHeader.hide() this.$fit.hide() - } - - if (app.store.SizingFooter === 'use_alt_text' && (app.store.SizingFooterText || "").length) { - var sizing_lines = app.store.SizingFooterText.replace(//g, "&rt;").split('\n').join("
") - this.$sizing.html(sizing_lines) - this.$sizing.show() - } - else { this.$sizing.hide() } 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 371cb20d..d744b66e 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 @@ -7,7 +7,7 @@ Stone Island.xcscheme 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 6372106b..dfb9fb09 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/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js index 0ad58acc..3bcf5ee4 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js @@ -217,18 +217,19 @@ var ProductView = ScrollableView.extend({ else { this.$fitHeader.hide() } + this.$fit.show() + + if (app.store.SizingFooter === 'use_alt_text' && (app.store.SizingFooterText || "").length) { + var sizing_lines = app.store.SizingFooterText.replace(//g, "&rt;").split('\n').join("
") + this.$sizing.html(sizing_lines) + this.$sizing.show() + } else if (app.store.SizingFooter === 'true') { + this.$sizing.show() + } } else { this.$fitHeader.hide() this.$fit.hide() - } - - if (app.store.SizingFooter === 'use_alt_text' && (app.store.SizingFooterText || "").length) { - var sizing_lines = app.store.SizingFooterText.replace(//g, "&rt;").split('\n').join("
") - this.$sizing.html(sizing_lines) - this.$sizing.show() - } - else { this.$sizing.hide() } -- cgit v1.2.3-70-g09d2