diff options
Diffstat (limited to 'StoneIsland/platforms/ios')
21 files changed, 109 insertions, 71 deletions
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 78679711..47ba0769 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -9,16 +9,16 @@ <key>CFBundleIdentifier</key> <string>us.okfoc.stoneisland</string> <key>CFBundleShortVersionString</key> - <string>0.8.4</string> + <string>0.8.5</string> <key>CFBundleVersion</key> - <string>0.8.4</string> + <string>0.8.5</string> <key>SigningIdentity</key> <string>iPhone Developer: Francesca Agusani (3ECUPBTQ5W)</string> </dict> <key>ArchiveVersion</key> <integer>2</integer> <key>CreationDate</key> - <date>2017-02-24T01:59:21Z</date> + <date>2017-03-13T02:17:54Z</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/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 49f9f34b..c588faa1 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 d621455d..7d440c97 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/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist Binary files differindex 8edd0375..9ac7273e 100644 --- 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 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 9b0d2a83..0abc7672 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 3cef3c77..083f6877 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 1fe9e719..4ada86e0 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 @@ -86,7 +86,7 @@ </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <data> - F0S7TexfDuNcAIzVC0uHjKsmET0= + /Wh746Q76RuE7ilR6jSINbcHMIE= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -94,7 +94,7 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key> <data> - vORlPdcjEZgAzfO+BhiOTHzi4JM= + j5MzLBRmbDhezR6tdN+aYV2lWgo= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -102,7 +102,7 @@ </data> <key>Info.plist</key> <data> - n6ar6ynUThHrQP9Hjgsas8PmS54= + oj6CSaHc/p4W/xQZnIM2O3W3jvw= </data> <key>LaunchImage-568h@2x.png</key> <data> @@ -162,7 +162,7 @@ </data> <key>MainViewController.nib</key> <data> - wTYhtGVBbIMGFBn5QdXdfDpUx90= + nlax0Qzrc3x2Dm8HOKWtPc4R1kw= </data> <key>PkgInfo</key> <data> @@ -174,7 +174,7 @@ </data> <key>config.xml</key> <data> - A7q1Fp8GdzxsF+R3b/ABOlpA8vw= + ulvVkeAbu0YWQ/suSz5vM3D1Duk= </data> <key>embedded.mobileprovision</key> <data> @@ -270,7 +270,7 @@ </data> <key>www/css/products.css</key> <data> - 8NxXmll+RoAdH9QSHGDD3UVZps8= + oj532+SFMYZGrM6WS5YrKptFn0g= </data> <key>www/css/vendor/flickity.css</key> <data> @@ -434,7 +434,7 @@ </data> <key>www/js/lib/blogs/BlogView.js</key> <data> - v8Sji53Jji6wQl1MUQtgg0B/ML8= + HBB00nKvi8KuQyINKlQuaN0YVM8= </data> <key>www/js/lib/blogs/HubView.js</key> <data> @@ -490,7 +490,7 @@ </data> <key>www/js/lib/etc/push.js</key> <data> - 4AS8661lKzsR4RPL9LfEgWrOOWI= + 091MnfJSOTgYMyjWrS5iqiSk5j0= </data> <key>www/js/lib/nav/AddressView.js</key> <data> @@ -530,7 +530,7 @@ </data> <key>www/js/lib/products/CollectionView.js</key> <data> - 4jUFxdjwhpGFj1x4zVhis4hY7Uw= + zD/7bB20CHAGKU2CybT2DiHLVDI= </data> <key>www/js/lib/products/GalleryView.js</key> <data> @@ -538,7 +538,7 @@ </data> <key>www/js/lib/products/ProductView.js</key> <data> - f4f6kyFycEeMm2nqWE8j/LO1F6k= + CPl4BKl46Rv3x+CP5Wj50aBFTtk= </data> <key>www/js/lib/products/Selector.js</key> <data> @@ -939,11 +939,11 @@ <dict> <key>hash</key> <data> - F0S7TexfDuNcAIzVC0uHjKsmET0= + /Wh746Q76RuE7ilR6jSINbcHMIE= </data> <key>hash2</key> <data> - rcFs3zbiTZtSodlJieh1YqEh5Kyq0jxSEbsSeAUGshk= + u7u7TmRT5rDnuIv89ZINuCbRzUVxqGwkZMJ8B/jMPos= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -961,11 +961,11 @@ <dict> <key>hash</key> <data> - vORlPdcjEZgAzfO+BhiOTHzi4JM= + j5MzLBRmbDhezR6tdN+aYV2lWgo= </data> <key>hash2</key> <data> - u3DPlANtTEMpU6qgkLJcWUhA0ryCmwgNg2jm9sO9ARg= + y10BglaaXBuvaMq1GOE1FbQ+CfDCReG6gyXr2gM4kQU= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -1137,11 +1137,11 @@ <dict> <key>hash</key> <data> - wTYhtGVBbIMGFBn5QdXdfDpUx90= + nlax0Qzrc3x2Dm8HOKWtPc4R1kw= </data> <key>hash2</key> <data> - aoZOoHUqnPGpSJqJu1JbOjYpzPGw1TwZczFLavFvrVE= + oWdDN9aw/EPCgQm4QgJHj6dOWH5YBXuWJFKydNI4Gis= </data> </dict> <key>archived-expanded-entitlements.xcent</key> @@ -1159,11 +1159,11 @@ <dict> <key>hash</key> <data> - A7q1Fp8GdzxsF+R3b/ABOlpA8vw= + ulvVkeAbu0YWQ/suSz5vM3D1Duk= </data> <key>hash2</key> <data> - n6NkgvFPcygrHCUAGKgtMo9EWeZZNiFVG+lp/nltW2c= + Hw/gY61GNBFaOycn07PXvQ2Nz1vSUKSJeUICLihgN3M= </data> </dict> <key>embedded.mobileprovision</key> @@ -1423,11 +1423,11 @@ <dict> <key>hash</key> <data> - 8NxXmll+RoAdH9QSHGDD3UVZps8= + oj532+SFMYZGrM6WS5YrKptFn0g= </data> <key>hash2</key> <data> - NfTW2zn/9ToYPcLte6yY2T2nz09Y4aBNC3bM6FoRxy8= + WXJhtEkDkjXj9MWtBw/TP8QUOGexOVRu/VYBiZb1SAM= </data> </dict> <key>www/css/vendor/flickity.css</key> @@ -1874,11 +1874,11 @@ <dict> <key>hash</key> <data> - v8Sji53Jji6wQl1MUQtgg0B/ML8= + HBB00nKvi8KuQyINKlQuaN0YVM8= </data> <key>hash2</key> <data> - TleNR88oXPBrIIfxl1ddXJY4TQMOT/zt/qCgMXrEopo= + n/A++mo0/6iDULki3n3RavdMzWuSZ5AvdCdUKPgTeis= </data> </dict> <key>www/js/lib/blogs/HubView.js</key> @@ -2028,11 +2028,11 @@ <dict> <key>hash</key> <data> - 4AS8661lKzsR4RPL9LfEgWrOOWI= + 091MnfJSOTgYMyjWrS5iqiSk5j0= </data> <key>hash2</key> <data> - CWzmVF9iJnT6To6S3B0/WTbMu/HkAApmu5igJYirofg= + dosnNVZrzPEs+FH07LHo0EEyxLZwxh/+Y3+wXxwN7EM= </data> </dict> <key>www/js/lib/nav/AddressView.js</key> @@ -2138,11 +2138,11 @@ <dict> <key>hash</key> <data> - 4jUFxdjwhpGFj1x4zVhis4hY7Uw= + zD/7bB20CHAGKU2CybT2DiHLVDI= </data> <key>hash2</key> <data> - LenKnMyS8MSesvN2WsopZD92r5vCiuIz7lN1YJuzX8Y= + xU5gur+RgyErpz0NoMSYrlnYtSKDnB2jT9T5qIozlZ0= </data> </dict> <key>www/js/lib/products/GalleryView.js</key> @@ -2160,11 +2160,11 @@ <dict> <key>hash</key> <data> - f4f6kyFycEeMm2nqWE8j/LO1F6k= + CPl4BKl46Rv3x+CP5Wj50aBFTtk= </data> <key>hash2</key> <data> - xsW10BpHPpNWBnTjmOa8KCkv85obf5rBUaV+rza1H7U= + 446nfB6rHykfE8xgnvWRGDg/+1kpBqpMefY5HazVnsA= </data> </dict> <key>www/js/lib/products/Selector.js</key> 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 606afe14..95e7c2ef 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 @@ <?xml version='1.0' encoding='utf-8'?> -<widget id="us.okfoc.stoneisland" version="0.8.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-versionCode="6000" id="us.okfoc.stoneisland" version="0.8.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <feature name="LocalStorage"> <param name="ios-package" value="CDVLocalStorage" /> </feature> 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 bdfed42a..664ff45b 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 @@ -224,6 +224,9 @@ padding-bottom:45px; #collection h1 { background-color: white; +} + +#collection h1.single-dept { background-image: url(../img/angle-down.png); background-size: contain; background-position: top right; @@ -231,6 +234,6 @@ padding-bottom:45px; } #selector { -z-index:9 + z-index:9 } diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/BlogView.js index 5ee7f641..1bd56908 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/BlogView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/BlogView.js @@ -48,7 +48,10 @@ var BlogView = View.extend({ else { app.departments = data.store[0].Departments app.department_id = data.store[0].Departments[0].uri + $("#collections h1").toggleClass("single-dept", data.store[0].Departments.length == 1) app.collection.setCollectionName( data.store[0].Departments[0].text ) + //// demo department for shoes with weird SizeTypeId + // app.department_id = "NKDrtSC" app.collection.loaded = false app.collection.fetch() } diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/push.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/push.js index 138c4896..da63fdd1 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/push.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/push.js @@ -1,7 +1,11 @@ var push = (function(){ - var push = { settings: {} } + var push = { settings: {}, disabled: false } var pushPlugin push.init = function(){ + if (device.platform !== "ios") { + push.disabled = true + return + } pushPlugin = PushNotification.init({ ios: { @@ -50,6 +54,7 @@ var push = (function(){ } } push.subscribe = function(channel, cb){ + if (push.disabled) return push.settings[channel] = true localStorage.setItem("yoox.push_" + channel, "true") var data = { @@ -73,6 +78,7 @@ var push = (function(){ }) } push.unsubscribe = function(channel, cb){ + if (push.disabled) return push.settings[channel] = false localStorage.setItem("yoox.push_" + channel, "false") var data = { diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/CollectionView.js index 671d36b3..3bc2623c 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/CollectionView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/CollectionView.js @@ -142,7 +142,9 @@ var CollectionView = ScrollableView.extend({ }, showDepartmentSelector: function(){ - this.filterView.filter() + if (this.$("h1").hasClass("single-dept")) { + this.filterView.filter() + } }, firstTouch: { x: 0, y: 0, id: "" }, 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 4d370f9f..a757f681 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 @@ -135,23 +135,17 @@ var ProductView = ScrollableView.extend({ var color = this.colors[default_color_id] var color_label = color.label var sizes = this.find_sizes_for_color(default_color_id) + var size = sizes[0] + var size_label = this.sizes[size].label - if (sizes.length) { - var size = sizes[0] - var size_label = this.sizes[size].label + this.gallery.populate( color.code, details['Item']['ImageTypes'] ) - this.gallery.populate( color.code, details['Item']['ImageTypes'] ) + this.color = color + this.size = size - this.color = color - this.size = size - - this.is_onesize = !! this.sizes[1] - - this.$size.show().html(size_label) - } - else { - } + this.is_onesize = !! this.sizes[1] + this.$size.show().html(size_label) if (color_label) { this.$color.html(color_label) } @@ -224,10 +218,21 @@ var ProductView = ScrollableView.extend({ }) details['Item']['ModelSizes'].forEach(function(size){ - var label = SIZE_LOOKUP[ size['Default']['Text'] ] - if (! label && ! size['Default']['Labeled']) { + var label = "" + if (details['Item']['SizeTypeId'] == 412) { // shoes label = size['Default']['Text'] + " " + size['Default']['ClassFamily'] + console.log("shoes?", label) + } + else { // everything else + label = SIZE_LOOKUP[ size['Default']['Text'] ] } + if (! label) { + label = size['Default']['Text'] + if (size['Default']['Labeled']) { + label += " " + size['Default']['ClassFamily'] + } + } + console.log(size) size_lookup[ label ] = size['SizeId'] console.log( label ) sizes[ size['SizeId'] ] = { 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 c271f69e..e591d9f5 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/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index 78f94e1b..9df040b0 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 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.8.4</string> + <string>0.8.5</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>0.8.4</string> + <string>0.8.5</string> <key>GCM_SENDER_ID</key> <string>XXXXXXX</string> <key>IS_GCM_ENABLED</key> diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index 606afe14..95e7c2ef 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget id="us.okfoc.stoneisland" version="0.8.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-versionCode="6000" id="us.okfoc.stoneisland" version="0.8.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <feature name="LocalStorage"> <param name="ios-package" value="CDVLocalStorage" /> </feature> diff --git a/StoneIsland/platforms/ios/www/css/products.css b/StoneIsland/platforms/ios/www/css/products.css index bdfed42a..664ff45b 100755 --- a/StoneIsland/platforms/ios/www/css/products.css +++ b/StoneIsland/platforms/ios/www/css/products.css @@ -224,6 +224,9 @@ padding-bottom:45px; #collection h1 { background-color: white; +} + +#collection h1.single-dept { background-image: url(../img/angle-down.png); background-size: contain; background-position: top right; @@ -231,6 +234,6 @@ padding-bottom:45px; } #selector { -z-index:9 + z-index:9 } diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js index 5ee7f641..1bd56908 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js @@ -48,7 +48,10 @@ var BlogView = View.extend({ else { app.departments = data.store[0].Departments app.department_id = data.store[0].Departments[0].uri + $("#collections h1").toggleClass("single-dept", data.store[0].Departments.length == 1) app.collection.setCollectionName( data.store[0].Departments[0].text ) + //// demo department for shoes with weird SizeTypeId + // app.department_id = "NKDrtSC" app.collection.loaded = false app.collection.fetch() } diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/push.js b/StoneIsland/platforms/ios/www/js/lib/etc/push.js index 138c4896..da63fdd1 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/push.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/push.js @@ -1,7 +1,11 @@ var push = (function(){ - var push = { settings: {} } + var push = { settings: {}, disabled: false } var pushPlugin push.init = function(){ + if (device.platform !== "ios") { + push.disabled = true + return + } pushPlugin = PushNotification.init({ ios: { @@ -50,6 +54,7 @@ var push = (function(){ } } push.subscribe = function(channel, cb){ + if (push.disabled) return push.settings[channel] = true localStorage.setItem("yoox.push_" + channel, "true") var data = { @@ -73,6 +78,7 @@ var push = (function(){ }) } push.unsubscribe = function(channel, cb){ + if (push.disabled) return push.settings[channel] = false localStorage.setItem("yoox.push_" + channel, "false") var data = { diff --git a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js index 671d36b3..3bc2623c 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js @@ -142,7 +142,9 @@ var CollectionView = ScrollableView.extend({ }, showDepartmentSelector: function(){ - this.filterView.filter() + if (this.$("h1").hasClass("single-dept")) { + this.filterView.filter() + } }, firstTouch: { x: 0, y: 0, id: "" }, diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js index 4d370f9f..a757f681 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js @@ -135,23 +135,17 @@ var ProductView = ScrollableView.extend({ var color = this.colors[default_color_id] var color_label = color.label var sizes = this.find_sizes_for_color(default_color_id) + var size = sizes[0] + var size_label = this.sizes[size].label - if (sizes.length) { - var size = sizes[0] - var size_label = this.sizes[size].label + this.gallery.populate( color.code, details['Item']['ImageTypes'] ) - this.gallery.populate( color.code, details['Item']['ImageTypes'] ) + this.color = color + this.size = size - this.color = color - this.size = size - - this.is_onesize = !! this.sizes[1] - - this.$size.show().html(size_label) - } - else { - } + this.is_onesize = !! this.sizes[1] + this.$size.show().html(size_label) if (color_label) { this.$color.html(color_label) } @@ -224,10 +218,21 @@ var ProductView = ScrollableView.extend({ }) details['Item']['ModelSizes'].forEach(function(size){ - var label = SIZE_LOOKUP[ size['Default']['Text'] ] - if (! label && ! size['Default']['Labeled']) { + var label = "" + if (details['Item']['SizeTypeId'] == 412) { // shoes label = size['Default']['Text'] + " " + size['Default']['ClassFamily'] + console.log("shoes?", label) + } + else { // everything else + label = SIZE_LOOKUP[ size['Default']['Text'] ] } + if (! label) { + label = size['Default']['Text'] + if (size['Default']['Labeled']) { + label += " " + size['Default']['ClassFamily'] + } + } + console.log(size) size_lookup[ label ] = size['SizeId'] console.log( label ) sizes[ size['SizeId'] ] = { |