diff options
Diffstat (limited to 'StoneIsland/platforms/ios/www/js')
7 files changed, 19 insertions, 12 deletions
diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js index 511849ad..72584894 100755 --- a/StoneIsland/platforms/ios/www/js/index.js +++ b/StoneIsland/platforms/ios/www/js/index.js @@ -103,9 +103,9 @@ var app = (function(){ // } if (navigator.onLine) { - app.account.connect() + app.account.connect(app.deepLinkRoute || '/intro') app.blog.fetch(function(){ - app.router.initial_route = "/intro" + app.router.initial_route = app.deepLinkRoute || "/intro" app.router.launch() }) } diff --git a/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js b/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js index 73637cd1..04dfa828 100755 --- a/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js +++ b/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js @@ -3,13 +3,13 @@ var AccountView = View.extend({ initialize: function(){ }, - connect: function(cb){ - auth.init(this.ready.bind(this, cb)) + connect: function(initialLoginPath){ + auth.init(this.ready.bind(this, function(){}, initialLoginPath)) }, - ready: function(cb){ + ready: function(cb, initialLoginPath){ if (auth.logged_in()) { - this.logged_in(cb) + this.logged_in(cb, initialLoginPath) } else { this.logged_out(cb) @@ -88,7 +88,7 @@ var AccountView = View.extend({ cb && cb() }, - logged_in: function(cb){ + logged_in: function(cb, initialLoginPath){ this.listAddresses() this.listCreditCards() $("#nav .login").hide() @@ -127,7 +127,12 @@ var AccountView = View.extend({ }) } else { - app.router.go("account/profile") + if (initialLoginPath) { + app.router.go(initialLoginPath) + } + else { + app.router.go("account/profile") + } app.curtain.hide("loading") } }, diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js index ad0fd9b0..20046fdf 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js @@ -175,7 +175,7 @@ var HubLoader = (function(){ HubLoader.build = function(){ view.append(item) view.scroller.refresh() - if (count === 3 && ! needed) return + if (count < 20 && ! needed) return // if (count === 10) return setTimeout(HubLoader.load, count < 10 ? 1000 : 5000) } diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/deeplink.js b/StoneIsland/platforms/ios/www/js/lib/etc/deeplink.js index 7667cfcd..fc3b52a9 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/deeplink.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/deeplink.js @@ -2,4 +2,5 @@ function handleOpenURL (url) { console.log("DEEP LINKING DETECTED", url) url = url.replace("stoneisland:/", "") app.router.parseRoute( url ) + app.deepLinkRoute = url }
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/push.js b/StoneIsland/platforms/ios/www/js/lib/etc/push.js index 29d2938f..746172eb 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/push.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/push.js @@ -132,6 +132,7 @@ var push = (function(){ pushPlugin.finish(function(){}, function(){}) if (push_obj.additionalData.url) { + app.deepLinkRoute = push_obj.additionalData.url app.router.go(push_obj.additionalData.url) } } diff --git a/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js b/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js index ae0a4fbc..de5fe951 100755 --- a/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js +++ b/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js @@ -78,7 +78,7 @@ var SerializableView = View.extend({ var $target = $(e.currentTarget), value = $target.val() var label = moment(value).format("MM/DD/YYYY") if (label === 'Invalid date') { - label = 'BIRTHDAY (OPTIONAL)' + label = '' // 'BIRTHDAY (OPTIONAL)' } $target.parent().addClass("picked") $target.parent().find("span").html(label) diff --git a/StoneIsland/platforms/ios/www/js/sdk/_sdk.js b/StoneIsland/platforms/ios/www/js/sdk/_sdk.js index fc871727..aa342ffa 100755 --- a/StoneIsland/platforms/ios/www/js/sdk/_sdk.js +++ b/StoneIsland/platforms/ios/www/js/sdk/_sdk.js @@ -34,8 +34,8 @@ var sdk = (function(){ } sdk.cms = function(){ - return "https://stone.giraffe.life" - // return "https://staging.stone.giraffe.life" + // return "https://stone.giraffe.life" + return "http://staging.stone.giraffe.life" } $.ajaxSetup({ |