diff options
| -rwxr-xr-x | StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate | bin | 37076 -> 37061 bytes | |||
| -rwxr-xr-x | StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist | 412 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/css/nav.css | 18 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/index.html | 2 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/js/lib/view/View.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/js/vendor/util.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/products/CollectionView.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/products/ProductView.js | 6 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/view/View.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/js/vendor/util.js | 2 |
10 files changed, 233 insertions, 215 deletions
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 Binary files differindex 369358c0..b811b6a2 100755 --- 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 diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index 06e9b00c..78446e5b 100755 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -1,209 +1,209 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleDisplayName</key> - <string>${PRODUCT_NAME}</string> - <key>CFBundleExecutable</key> - <string>${EXECUTABLE_NAME}</string> - <key>CFBundleIconFile</key> - <string>icon.png</string> - <key>CFBundleIcons</key> - <dict> - <key>CFBundlePrimaryIcon</key> - <dict> - <key>CFBundleIconFiles</key> - <array> - <string>icon-40</string> - <string>icon-small</string> - <string>icon-60</string> - <string>icon.png</string> - <string>icon@2x</string> - <string>icon-72</string> - <string>icon-72@2x</string> - </array> - <key>UIPrerenderedIcon</key> - <false/> - </dict> - </dict> - <key>CFBundleIcons~ipad</key> - <dict> - <key>CFBundlePrimaryIcon</key> - <dict> - <key>CFBundleIconFiles</key> - <array> - <string>icon-small</string> - <string>icon-40</string> - <string>icon-50</string> - <string>icon-76</string> - <string>icon-60</string> - <string>icon</string> - <string>icon@2x</string> - <string>icon-72</string> - <string>icon-72@2x</string> - </array> - <key>UIPrerenderedIcon</key> - <false/> - </dict> - </dict> - <key>CFBundleIdentifier</key> - <string>us.okfoc.stoneisland</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>${PRODUCT_NAME}</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>0.3.3</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleURLTypes</key> - <array> - <dict> - <key>CFBundleURLSchemes</key> - <array> - <string>stoneisland</string> - </array> - </dict> - </array> - <key>CFBundleVersion</key> - <string>0.3.3</string> - <key>LSRequiresIPhoneOS</key> - <true/> - <key>NSAppTransportSecurity</key> - <dict> - <key>NSAllowsArbitraryLoads</key> - <true/> - </dict> - <key>NSLocationWhenInUseUsageDescription</key> - <string></string> - <key>NSMainNibFile~ipad</key> - <string></string> - <key>UIBackgroundModes</key> - <array> - <string>remote-notification</string> - </array> - <key>UIInterfaceOrientation</key> - <array> - <string>UIInterfaceOrientationPortrait</string> - </array> - <key>UILaunchImages</key> - <array> - <dict> - <key>UILaunchImageMinimumOSVersion</key> - <string>8.0</string> - <key>UILaunchImageName</key> - <string>Default</string> - <key>UILaunchImageOrientation</key> - <string>Portrait</string> - <key>UILaunchImageSize</key> - <string>{320, 480}</string> - </dict> - <dict> - <key>UILaunchImageMinimumOSVersion</key> - <string>8.0</string> - <key>UILaunchImageName</key> - <string>Default</string> - <key>UILaunchImageOrientation</key> - <string>Landscape</string> - <key>UILaunchImageSize</key> - <string>{320, 480}</string> - </dict> - <dict> - <key>UILaunchImageMinimumOSVersion</key> - <string>8.0</string> - <key>UILaunchImageName</key> - <string>Default-568h</string> - <key>UILaunchImageOrientation</key> - <string>Portrait</string> - <key>UILaunchImageSize</key> - <string>{320, 568}</string> - </dict> - <dict> - <key>UILaunchImageMinimumOSVersion</key> - <string>8.0</string> - <key>UILaunchImageName</key> - <string>Default-568h</string> - <key>UILaunchImageOrientation</key> - <string>Landscape</string> - <key>UILaunchImageSize</key> - <string>{320, 568}</string> - </dict> - <dict> - <key>UILaunchImageMinimumOSVersion</key> - <string>8.0</string> - <key>UILaunchImageName</key> - <string>Default-667h</string> - <key>UILaunchImageOrientation</key> - <string>Portrait</string> - <key>UILaunchImageSize</key> - <string>{375, 667}</string> - </dict> - <dict> - <key>UILaunchImageMinimumOSVersion</key> - <string>8.0</string> - <key>UILaunchImageName</key> - <string>Default-667h</string> - <key>UILaunchImageOrientation</key> - <string>Landscape</string> - <key>UILaunchImageSize</key> - <string>{375, 667}</string> - </dict> - <dict> - <key>UILaunchImageMinimumOSVersion</key> - <string>8.0</string> - <key>UILaunchImageName</key> - <string>Default-736h</string> - <key>UILaunchImageOrientation</key> - <string>Portrait</string> - <key>UILaunchImageSize</key> - <string>{414, 736}</string> - </dict> - <dict> - <key>UILaunchImageMinimumOSVersion</key> - <string>8.0</string> - <key>UILaunchImageName</key> - <string>Default-Landscape-736h</string> - <key>UILaunchImageOrientation</key> - <string>Landscape</string> - <key>UILaunchImageSize</key> - <string>{414, 736}</string> - </dict> - <dict> - <key>UILaunchImageMinimumOSVersion</key> - <string>8.0</string> - <key>UILaunchImageName</key> - <string>Default-Portrait</string> - <key>UILaunchImageOrientation</key> - <string>Portrait</string> - <key>UILaunchImageSize</key> - <string>{768, 1024}</string> - </dict> - <dict> - <key>UILaunchImageMinimumOSVersion</key> - <string>8.0</string> - <key>UILaunchImageName</key> - <string>Default-Landscape</string> - <key>UILaunchImageOrientation</key> - <string>Landscape</string> - <key>UILaunchImageSize</key> - <string>{768, 1024}</string> - </dict> - </array> - <key>UIRequiresFullScreen</key> - <true/> - <key>UISupportedInterfaceOrientations</key> - <array> - <string>UIInterfaceOrientationPortrait</string> - <string>UIInterfaceOrientationPortraitUpsideDown</string> - </array> - <key>UISupportedInterfaceOrientations~ipad</key> - <array> - <string>UIInterfaceOrientationPortrait</string> - <string>UIInterfaceOrientationPortraitUpsideDown</string> - </array> -</dict> -</plist> + <dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleDisplayName</key> + <string>${PRODUCT_NAME}</string> + <key>CFBundleExecutable</key> + <string>${EXECUTABLE_NAME}</string> + <key>CFBundleIconFile</key> + <string>icon.png</string> + <key>CFBundleIcons</key> + <dict> + <key>CFBundlePrimaryIcon</key> + <dict> + <key>CFBundleIconFiles</key> + <array> + <string>icon-40</string> + <string>icon-small</string> + <string>icon-60</string> + <string>icon.png</string> + <string>icon@2x</string> + <string>icon-72</string> + <string>icon-72@2x</string> + </array> + <key>UIPrerenderedIcon</key> + <false/> + </dict> + </dict> + <key>CFBundleIcons~ipad</key> + <dict> + <key>CFBundlePrimaryIcon</key> + <dict> + <key>CFBundleIconFiles</key> + <array> + <string>icon-small</string> + <string>icon-40</string> + <string>icon-50</string> + <string>icon-76</string> + <string>icon-60</string> + <string>icon</string> + <string>icon@2x</string> + <string>icon-72</string> + <string>icon-72@2x</string> + </array> + <key>UIPrerenderedIcon</key> + <false/> + </dict> + </dict> + <key>CFBundleIdentifier</key> + <string>us.okfoc.stoneisland</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>${PRODUCT_NAME}</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>0.3.2</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleURLTypes</key> + <array> + <dict> + <key>CFBundleURLSchemes</key> + <array> + <string>stoneisland</string> + </array> + </dict> + </array> + <key>CFBundleVersion</key> + <string>0.3.2</string> + <key>LSRequiresIPhoneOS</key> + <true/> + <key>NSAppTransportSecurity</key> + <dict> + <key>NSAllowsArbitraryLoads</key> + <true/> + </dict> + <key>NSLocationWhenInUseUsageDescription</key> + <string/> + <key>NSMainNibFile~ipad</key> + <string/> + <key>UIBackgroundModes</key> + <array> + <string>remote-notification</string> + </array> + <key>UIInterfaceOrientation</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + </array> + <key>UILaunchImages</key> + <array> + <dict> + <key>UILaunchImageMinimumOSVersion</key> + <string>8.0</string> + <key>UILaunchImageName</key> + <string>Default</string> + <key>UILaunchImageOrientation</key> + <string>Portrait</string> + <key>UILaunchImageSize</key> + <string>{320, 480}</string> + </dict> + <dict> + <key>UILaunchImageMinimumOSVersion</key> + <string>8.0</string> + <key>UILaunchImageName</key> + <string>Default</string> + <key>UILaunchImageOrientation</key> + <string>Landscape</string> + <key>UILaunchImageSize</key> + <string>{320, 480}</string> + </dict> + <dict> + <key>UILaunchImageMinimumOSVersion</key> + <string>8.0</string> + <key>UILaunchImageName</key> + <string>Default-568h</string> + <key>UILaunchImageOrientation</key> + <string>Portrait</string> + <key>UILaunchImageSize</key> + <string>{320, 568}</string> + </dict> + <dict> + <key>UILaunchImageMinimumOSVersion</key> + <string>8.0</string> + <key>UILaunchImageName</key> + <string>Default-568h</string> + <key>UILaunchImageOrientation</key> + <string>Landscape</string> + <key>UILaunchImageSize</key> + <string>{320, 568}</string> + </dict> + <dict> + <key>UILaunchImageMinimumOSVersion</key> + <string>8.0</string> + <key>UILaunchImageName</key> + <string>Default-667h</string> + <key>UILaunchImageOrientation</key> + <string>Portrait</string> + <key>UILaunchImageSize</key> + <string>{375, 667}</string> + </dict> + <dict> + <key>UILaunchImageMinimumOSVersion</key> + <string>8.0</string> + <key>UILaunchImageName</key> + <string>Default-667h</string> + <key>UILaunchImageOrientation</key> + <string>Landscape</string> + <key>UILaunchImageSize</key> + <string>{375, 667}</string> + </dict> + <dict> + <key>UILaunchImageMinimumOSVersion</key> + <string>8.0</string> + <key>UILaunchImageName</key> + <string>Default-736h</string> + <key>UILaunchImageOrientation</key> + <string>Portrait</string> + <key>UILaunchImageSize</key> + <string>{414, 736}</string> + </dict> + <dict> + <key>UILaunchImageMinimumOSVersion</key> + <string>8.0</string> + <key>UILaunchImageName</key> + <string>Default-Landscape-736h</string> + <key>UILaunchImageOrientation</key> + <string>Landscape</string> + <key>UILaunchImageSize</key> + <string>{414, 736}</string> + </dict> + <dict> + <key>UILaunchImageMinimumOSVersion</key> + <string>8.0</string> + <key>UILaunchImageName</key> + <string>Default-Portrait</string> + <key>UILaunchImageOrientation</key> + <string>Portrait</string> + <key>UILaunchImageSize</key> + <string>{768, 1024}</string> + </dict> + <dict> + <key>UILaunchImageMinimumOSVersion</key> + <string>8.0</string> + <key>UILaunchImageName</key> + <string>Default-Landscape</string> + <key>UILaunchImageOrientation</key> + <string>Landscape</string> + <key>UILaunchImageSize</key> + <string>{768, 1024}</string> + </dict> + </array> + <key>UIRequiresFullScreen</key> + <true/> + <key>UISupportedInterfaceOrientations</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + <string>UIInterfaceOrientationPortraitUpsideDown</string> + </array> + <key>UISupportedInterfaceOrientations~ipad</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + <string>UIInterfaceOrientationPortraitUpsideDown</string> + </array> + </dict> +</plist>
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/css/nav.css b/StoneIsland/platforms/ios/www/css/nav.css index f76fb744..15b7f004 100755 --- a/StoneIsland/platforms/ios/www/css/nav.css +++ b/StoneIsland/platforms/ios/www/css/nav.css @@ -174,6 +174,24 @@ padding-bottom:0px; z-index: 2 } +#intro .alert { + box-sizing: border-box; + width: calc(100vw); + text-align: center; + font-size: 14pt; + font-weight: bold; + line-height: 0; + text-transform: uppercase; + color: #3E6616; + position: absolute; + height: 0; + left: 0; + top: auto; + bottom: calc(25vh - 58px); + margin: auto 0; + padding: 0; +} + /* HEADER AND FOOTER ON MOST PAGES */ diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index 8393eda1..be520d2c 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -101,7 +101,7 @@ <div class="hub">HUB</div> <div class="story">STORY</div> <div class="archive">ARCHIVE</div> - <span + <div class="alert"></div> <span class="latlng">+40° 58' 90" -74° 04' 46"</span> </div> diff --git a/StoneIsland/platforms/ios/www/js/lib/view/View.js b/StoneIsland/platforms/ios/www/js/lib/view/View.js index fe145221..2401df0d 100755 --- a/StoneIsland/platforms/ios/www/js/lib/view/View.js +++ b/StoneIsland/platforms/ios/www/js/lib/view/View.js @@ -59,7 +59,6 @@ var View = (function($, _){ var match = key.match(delegateEventSplitter); var eventName = match[1], selector = match[2]; method = _.bind(method, this); - eventName += '.delegateEvents' + this._id; if (is_mobile) { if (eventName === 'mouseenter' || eventName === 'mouseleave') { continue @@ -68,6 +67,7 @@ var View = (function($, _){ eventName = 'touchstart' } } + eventName += '.delegateEvents' + this._id; if (selector === '') { this.$el.on(eventName, method); } else { diff --git a/StoneIsland/platforms/ios/www/js/vendor/util.js b/StoneIsland/platforms/ios/www/js/vendor/util.js index 23f55d4c..e09b6ada 100755 --- a/StoneIsland/platforms/ios/www/js/vendor/util.js +++ b/StoneIsland/platforms/ios/www/js/vendor/util.js @@ -143,7 +143,7 @@ if (!Function.prototype.bind) { }()); // Identify browser based on useragent string -(function( ua ) { +var browser = (function( ua ) { ua = ua.toLowerCase(); var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || /(webkit)[ \/]([\w.]+)/.exec( ua ) || diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js index 7a020798..798920d1 100755 --- a/StoneIsland/www/js/lib/products/CollectionView.js +++ b/StoneIsland/www/js/lib/products/CollectionView.js @@ -49,7 +49,7 @@ var CollectionView = ScrollableView.extend({ return } this.$loader.show() - sdk.product.collection({ + sdk.product.all({ gallery_id: app.gallery_id, success: this.populate.bind(this) }) diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js index 285e551d..484cd442 100755 --- a/StoneIsland/www/js/lib/products/ProductView.js +++ b/StoneIsland/www/js/lib/products/ProductView.js @@ -56,7 +56,7 @@ var ProductView = ScrollableView.extend({ cache: {}, - gallery_prev: function(){ + gallery_left: function(){ app.product.gallery.gallery.previous() }, gallery_right: function(){ @@ -250,8 +250,8 @@ var ProductView = ScrollableView.extend({ app.selector.select("style", colors, function(color){ this.code = color.code this.$color.html(color.label) - - // UPDATE GALLERY + this.gallery.populate( color.code, this.details['ImageTypes'] ) + this.gallery_right() }.bind(this)) }, diff --git a/StoneIsland/www/js/lib/view/View.js b/StoneIsland/www/js/lib/view/View.js index fe145221..2401df0d 100755 --- a/StoneIsland/www/js/lib/view/View.js +++ b/StoneIsland/www/js/lib/view/View.js @@ -59,7 +59,6 @@ var View = (function($, _){ var match = key.match(delegateEventSplitter); var eventName = match[1], selector = match[2]; method = _.bind(method, this); - eventName += '.delegateEvents' + this._id; if (is_mobile) { if (eventName === 'mouseenter' || eventName === 'mouseleave') { continue @@ -68,6 +67,7 @@ var View = (function($, _){ eventName = 'touchstart' } } + eventName += '.delegateEvents' + this._id; if (selector === '') { this.$el.on(eventName, method); } else { diff --git a/StoneIsland/www/js/vendor/util.js b/StoneIsland/www/js/vendor/util.js index 23f55d4c..e09b6ada 100755 --- a/StoneIsland/www/js/vendor/util.js +++ b/StoneIsland/www/js/vendor/util.js @@ -143,7 +143,7 @@ if (!Function.prototype.bind) { }()); // Identify browser based on useragent string -(function( ua ) { +var browser = (function( ua ) { ua = ua.toLowerCase(); var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || /(webkit)[ \/]([\w.]+)/.exec( ua ) || |
