diff options
14 files changed, 80 insertions, 62 deletions
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 1f0dfaa9..b4c661fe 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>2017-09-25T17:04:37Z</date> + <date>2017-09-25T17:20:14Z</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 11472fb5..e8c80428 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 a0e39fd0..e372d277 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 11a8a0d0..b5ec47bc 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 b615db36..12fa41c4 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 6fb3015b..349daaa1 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 bc4e090b..9d041f8f 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,11 +86,11 @@ </data> <key>Assets.car</key> <data> - AdU9YWwWWn0LL+gfqyfsiNQzx2E= + c7cQjaJd7R2Nht7YeBCfIriwFIw= </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <data> - XMok8vDfArEptCvkn+RMLVR7/jY= + QfKNiUmpkuX2BR116ONpsqXyJ5g= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -98,7 +98,7 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key> <data> - GveA29qcysevL9K+WnrL9F0q1Xg= + zwpugbO7/ezK+k04J2eIughVr7Y= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -166,7 +166,7 @@ </data> <key>MainViewController.nib</key> <data> - IxKIz0YfQPNN+CNVoYnjomRkX9M= + rlzpyuixdnUf5Fo0uggUxNCUbzc= </data> <key>PkgInfo</key> <data> @@ -270,7 +270,7 @@ </data> <key>www/css/nav.css</key> <data> - bb7+YzPvUafZeDDeLssmEeR+m5Y= + tNCurPA7ni1EDWw/jvw9w67DpVU= </data> <key>www/css/products.css</key> <data> @@ -498,7 +498,7 @@ </data> <key>www/js/lib/etc/push.js</key> <data> - od1QNWb1S5GRtgwku4lrpTT5z7s= + lXGqoF3JDAFzFbpV0m5Dr7xQ+uY= </data> <key>www/js/lib/nav/AddressView.js</key> <data> @@ -959,22 +959,22 @@ <dict> <key>hash</key> <data> - AdU9YWwWWn0LL+gfqyfsiNQzx2E= + c7cQjaJd7R2Nht7YeBCfIriwFIw= </data> <key>hash2</key> <data> - C0OHLeKT9LD6EwBwIVXEggPz/1HkxQgjlek0ovlHSCE= + q9T5OSlWsvnz4qAma+oOBwTWA6Dichr6tVY6PcMt4qM= </data> </dict> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <dict> <key>hash</key> <data> - XMok8vDfArEptCvkn+RMLVR7/jY= + QfKNiUmpkuX2BR116ONpsqXyJ5g= </data> <key>hash2</key> <data> - h65aEdQkRZQfBfcDGeLs5IbMsabOIbaJhUUSkUzA7KQ= + 8FPGjV6ofRu2EkZLf3VsDAkc+b0Gl+dneIgkT3Pjy7s= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -992,11 +992,11 @@ <dict> <key>hash</key> <data> - GveA29qcysevL9K+WnrL9F0q1Xg= + zwpugbO7/ezK+k04J2eIughVr7Y= </data> <key>hash2</key> <data> - nHTJvX2N7mYbW0cvu6MqCoYpfTfUnAYLEUOT9GusDPQ= + WwR6UCvRvU8aw4ifEbhdMUI0nEZPeq0M63tDBGqSGI4= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -1168,11 +1168,11 @@ <dict> <key>hash</key> <data> - IxKIz0YfQPNN+CNVoYnjomRkX9M= + rlzpyuixdnUf5Fo0uggUxNCUbzc= </data> <key>hash2</key> <data> - 9RKL7UWJyeLf50AjlnJsz3PLrbW7BxElXWroJXPfh2o= + Wy+l7QC1BAumuuH/+fYw86ankvdNafN5g8Uwg+H8yCQ= </data> </dict> <key>archived-expanded-entitlements.xcent</key> @@ -1443,11 +1443,11 @@ <dict> <key>hash</key> <data> - bb7+YzPvUafZeDDeLssmEeR+m5Y= + tNCurPA7ni1EDWw/jvw9w67DpVU= </data> <key>hash2</key> <data> - aCppewKGWTTfbOS3m6hhUMPCcrQDjf8FAGmWauRasjg= + 2o4b/avhcyA5pKh3T6ScNPY7gsTaD0+B9b8rFdYm+Gc= </data> </dict> <key>www/css/products.css</key> @@ -2070,11 +2070,11 @@ <dict> <key>hash</key> <data> - od1QNWb1S5GRtgwku4lrpTT5z7s= + lXGqoF3JDAFzFbpV0m5Dr7xQ+uY= </data> <key>hash2</key> <data> - 6V6mvf2UJ0zXesqTmLPv5RpR2gghv+saPePjoSIPAiI= + PnAVCDHnmi7tyE7sK/K3c/GWhxYZ0pvzP4bY+3mNqYY= </data> </dict> <key>www/js/lib/nav/AddressView.js</key> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css index aee8e21c..28385680 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css @@ -17,11 +17,6 @@ -webkit-transform: translateZ(0) translateX(0px); -webkit-transition: -webkit-transform 0.1s; } -.oldios #nav, -.oldios #content { - top: 20px; - height: -webkit-calc(100% - 20px); -} .nav #nav { -webkit-transform: translateZ(0) translateX(0); } 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 1606199f..14236728 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 @@ -106,28 +106,39 @@ var push = (function(){ } push.got_push_notification = function(push_obj) { console.log('We received this push notification: ' + JSON.stringify(push_obj)); + window.zsazsa = push_obj app.blog.refresh() + + push_obj.additionalData = push_obj.additionalData || {} + + var is_hub = true try { - var is_hub = JSON.stringify(push_obj || {}).match(/hub/i) - if (is_hub) { - app.intro.$alert.show().html("[ HUB UPDATED ]") - } - else { - auth.clear_cart() - app.intro.$alert.show().html("[ STORE UPDATED ]") - } + is_hub = JSON.stringify(push_obj || {}).match(/hub/i) } catch (e) { + } + + if (is_hub || push_obj.additionalData.url)) { app.intro.$alert.show().html("[ HUB UPDATED ]") } + else { + auth.clear_cart() + app.intro.$alert.show().html("[ STORE UPDATED ]") + } if (push_obj.additionalData.foreground === false) { // TODO: route the user to the uri in push_obj pushPlugin.finish(function(){}, function(){}) } + else if (push_obj.additionalData.url) { + app.router.go(push_obj.additionalData.url) + } + else if (is_hub) { + app.router.go("hub") + } else { - app.route("intro") + app.router.go("intro") } } push.error = function(e){ 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 cf672db4..c4d6d031 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/css/nav.css b/StoneIsland/platforms/ios/www/css/nav.css index aee8e21c..28385680 100755 --- a/StoneIsland/platforms/ios/www/css/nav.css +++ b/StoneIsland/platforms/ios/www/css/nav.css @@ -17,11 +17,6 @@ -webkit-transform: translateZ(0) translateX(0px); -webkit-transition: -webkit-transform 0.1s; } -.oldios #nav, -.oldios #content { - top: 20px; - height: -webkit-calc(100% - 20px); -} .nav #nav { -webkit-transform: translateZ(0) translateX(0); } diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/push.js b/StoneIsland/platforms/ios/www/js/lib/etc/push.js index 1606199f..14236728 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/push.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/push.js @@ -106,28 +106,39 @@ var push = (function(){ } push.got_push_notification = function(push_obj) { console.log('We received this push notification: ' + JSON.stringify(push_obj)); + window.zsazsa = push_obj app.blog.refresh() + + push_obj.additionalData = push_obj.additionalData || {} + + var is_hub = true try { - var is_hub = JSON.stringify(push_obj || {}).match(/hub/i) - if (is_hub) { - app.intro.$alert.show().html("[ HUB UPDATED ]") - } - else { - auth.clear_cart() - app.intro.$alert.show().html("[ STORE UPDATED ]") - } + is_hub = JSON.stringify(push_obj || {}).match(/hub/i) } catch (e) { + } + + if (is_hub || push_obj.additionalData.url)) { app.intro.$alert.show().html("[ HUB UPDATED ]") } + else { + auth.clear_cart() + app.intro.$alert.show().html("[ STORE UPDATED ]") + } if (push_obj.additionalData.foreground === false) { // TODO: route the user to the uri in push_obj pushPlugin.finish(function(){}, function(){}) } + else if (push_obj.additionalData.url) { + app.router.go(push_obj.additionalData.url) + } + else if (is_hub) { + app.router.go("hub") + } else { - app.route("intro") + app.router.go("intro") } } push.error = function(e){ diff --git a/StoneIsland/www/css/nav.css b/StoneIsland/www/css/nav.css index aee8e21c..28385680 100755 --- a/StoneIsland/www/css/nav.css +++ b/StoneIsland/www/css/nav.css @@ -17,11 +17,6 @@ -webkit-transform: translateZ(0) translateX(0px); -webkit-transition: -webkit-transform 0.1s; } -.oldios #nav, -.oldios #content { - top: 20px; - height: -webkit-calc(100% - 20px); -} .nav #nav { -webkit-transform: translateZ(0) translateX(0); } diff --git a/StoneIsland/www/js/lib/etc/push.js b/StoneIsland/www/js/lib/etc/push.js index 1606199f..00a2e839 100755 --- a/StoneIsland/www/js/lib/etc/push.js +++ b/StoneIsland/www/js/lib/etc/push.js @@ -105,29 +105,40 @@ var push = (function(){ return sdk.cms() + '/_services/push/' + key } push.got_push_notification = function(push_obj) { - console.log('We received this push notification: ' + JSON.stringify(push_obj)); + // console.log('We received this push notification: ' + JSON.stringify(push_obj)); + app.blog.refresh() + + push_obj.additionalData = push_obj.additionalData || {} + + var is_hub = true try { - var is_hub = JSON.stringify(push_obj || {}).match(/hub/i) - if (is_hub) { - app.intro.$alert.show().html("[ HUB UPDATED ]") - } - else { - auth.clear_cart() - app.intro.$alert.show().html("[ STORE UPDATED ]") - } + is_hub = JSON.stringify(push_obj || {}).match(/hub/i) } catch (e) { + } + + if (is_hub) { app.intro.$alert.show().html("[ HUB UPDATED ]") } + else if (! push_obj.additionalData.url) { + auth.clear_cart() + app.intro.$alert.show().html("[ STORE UPDATED ]") + } if (push_obj.additionalData.foreground === false) { // TODO: route the user to the uri in push_obj pushPlugin.finish(function(){}, function(){}) } + else if (push_obj.additionalData.url) { + app.router.go(push_obj.additionalData.url) + } + else if (is_hub) { + app.router.go("hub") + } else { - app.route("intro") + app.router.go("intro") } } push.error = function(e){ |