From 597fa051833ca3df6eb185c0143ff82e02dacba1 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 26 Sep 2017 01:35:13 +0200 Subject: push plugin ugh --- StoneIsland/platforms/ios/www/js/lib/_router.js | 2 +- StoneIsland/platforms/ios/www/js/lib/etc/push.js | 9 +++++---- StoneIsland/platforms/ios/www/js/lib/products/ProductView.js | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'StoneIsland/platforms/ios/www/js/lib') diff --git a/StoneIsland/platforms/ios/www/js/lib/_router.js b/StoneIsland/platforms/ios/www/js/lib/_router.js index 43438854..19bd3247 100755 --- a/StoneIsland/platforms/ios/www/js/lib/_router.js +++ b/StoneIsland/platforms/ios/www/js/lib/_router.js @@ -88,7 +88,7 @@ var SiteRouter = Router.extend({ app.view = app[name] } - window.FirebasePlugin && window.FirebasePlugin.setScreenName(name) + // window.FirebasePlugin && window.FirebasePlugin.setScreenName(name) app.header.set_back( !! app.view.back ) app.view.show() diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/push.js b/StoneIsland/platforms/ios/www/js/lib/etc/push.js index 00a2e839..f3f3132e 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/push.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/push.js @@ -7,7 +7,7 @@ var push = (function(){ push.disabled = true return } - + pushPlugin = PushNotification.init({ ios: { alert: true, @@ -130,9 +130,10 @@ var push = (function(){ 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) + + if (push_obj.additionalData.url) { + app.router.go(push_obj.additionalData.url) + } } else if (is_hub) { app.router.go("hub") diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js index 2743946a..6972b436 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js @@ -167,7 +167,7 @@ var ProductView = ScrollableView.extend({ this.$price.html(price) this.$body.html(body) - window.FirebasePlugin && window.FirebasePlugin.setScreenName('product:' + code) + // window.FirebasePlugin && window.FirebasePlugin.setScreenName('product:' + code) this.$productHeader.toggleClass("wide", title.length > 48) -- cgit v1.2.3-70-g09d2