diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2018-06-08 01:17:29 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2018-06-08 01:17:29 +0200 |
| commit | 76df508468975b9ffdd47373e5a406e21ac8cfdf (patch) | |
| tree | d15db20949f1bb084e357ff38fa122f19ec36e73 | |
| parent | 997d410746c5fc5e71049a4cc546ec1ff0344c29 (diff) | |
mauh
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 @@ <key>CordovaLib.xcscheme</key> <dict> <key>orderHint</key> - <integer>3</integer> + <integer>2</integer> </dict> </dict> </dict> 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 @@ <key>ArchiveVersion</key> <integer>2</integer> <key>CreationDate</key> - <date>2018-05-11T16:37:02Z</date> + <date>2018-06-07T14:13:12Z</date> <key>Name</key> <string>Stone Island</string> <key>SchemeName</key> 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 Binary files differindex 8d09afe3..503630f3 100644 --- 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 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 Binary files differindex 03508bdf..435bc4a5 100644 --- 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 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 Binary files differindex de0a186b..0e9ee2cc 100644 --- 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 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 Binary files differindex cad52f04..3cd81fe0 100644 --- 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 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 Binary files differindex f99532ad..83e0cbfd 100755 --- 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 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 @@ </data> <key>Assets.car</key> <data> - GN2nb+g/cHX8bnm2ecz16Sra+nc= + J0A+o1ndokPaM9LIbaY3RCU2OSY= </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <data> - aabcMTBlmk/hXoso7hD09VPsBio= + r6EFHh5xw3jmobvUq9ENT1G9LJQ= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -106,7 +106,7 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key> <data> - CggX5ov/zL2mrIaWW24kXthuu2k= + IF5ajdY1B0/fl2fXzBH6/hrivIA= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -118,7 +118,7 @@ </data> <key>MainViewController.nib</key> <data> - Py1vsWb79R9BWyFZnv3kd3jJ0TU= + 7Y1YDVWwPWU4Wl1BhmyY6OWFsqs= </data> <key>PkgInfo</key> <data> @@ -506,7 +506,7 @@ </data> <key>www/js/lib/products/ProductView.js</key> <data> - jftXU0zGMaj1mxbmp15NfN7qh2w= + OvyCvqKno4Hvm5R6fcB5SHDfj+s= </data> <key>www/js/lib/products/Selector.js</key> <data> @@ -937,22 +937,22 @@ <dict> <key>hash</key> <data> - GN2nb+g/cHX8bnm2ecz16Sra+nc= + J0A+o1ndokPaM9LIbaY3RCU2OSY= </data> <key>hash2</key> <data> - Hbx6owpnbS3cLwPzGi5638Cw006jgGSMvWkHb1eAvIg= + GLa3sHmjn0+6qtOG3b5hCRufe6dXS/pj4z2mQwl0ioo= </data> </dict> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <dict> <key>hash</key> <data> - aabcMTBlmk/hXoso7hD09VPsBio= + r6EFHh5xw3jmobvUq9ENT1G9LJQ= </data> <key>hash2</key> <data> - C5Dh7BZYEqwKlYSbHY9prPiOLND5dHgdlUWHnfj/JH8= + NGG5cppBU+WBlPIWqDloWwHSvsjF7wVowKH7G0AUk5Q= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -970,11 +970,11 @@ <dict> <key>hash</key> <data> - CggX5ov/zL2mrIaWW24kXthuu2k= + IF5ajdY1B0/fl2fXzBH6/hrivIA= </data> <key>hash2</key> <data> - MumZ0aQWkzPxBWZFNOo6+gRBa/opbiddZJBaHSdwbYs= + 8ErfbY5UjOdvrwZv3pNySOs9sLbEbPVdWe6XvcSGgQQ= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -992,11 +992,11 @@ <dict> <key>hash</key> <data> - Py1vsWb79R9BWyFZnv3kd3jJ0TU= + 7Y1YDVWwPWU4Wl1BhmyY6OWFsqs= </data> <key>hash2</key> <data> - bLEpCWPmKykSMk2BhmSPgQe8wtEdo/4oC7JJhySbt+M= + XpZbKB4l2DRJTTMzveU/XYRObkDwDN+Szzj6U2r5RN8= </data> </dict> <key>config.xml</key> @@ -2048,11 +2048,11 @@ <dict> <key>hash</key> <data> - jftXU0zGMaj1mxbmp15NfN7qh2w= + OvyCvqKno4Hvm5R6fcB5SHDfj+s= </data> <key>hash2</key> <data> - kYrw23DCTnoWYOZzove5yMixrTDBBWvFFrtdd14AemU= + d0gYTwzKDGmRJ6k+2KgDNMGQbsYiqJFK3ZijApq0GaM= </data> </dict> <key>www/js/lib/products/Selector.js</key> 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, "<").replace(/>/g, "&rt;").split('\n').join("<br>") + 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, "<").replace(/>/g, "&rt;").split('\n').join("<br>") - 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 @@ <key>Stone Island.xcscheme</key> <dict> <key>orderHint</key> - <integer>2</integer> + <integer>3</integer> </dict> </dict> </dict> 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 Binary files differindex 6372106b..dfb9fb09 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate +++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate 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, "<").replace(/>/g, "&rt;").split('\n').join("<br>") + 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, "<").replace(/>/g, "&rt;").split('\n').join("<br>") - this.$sizing.html(sizing_lines) - this.$sizing.show() - } - else { this.$sizing.hide() } |
