From 4380488815fa9dfe899fbacf71f5e0848544dd37 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 24 Nov 2017 01:24:24 +0100 Subject: fix deep linking --- StoneIsland/config.xml | 2 +- .../xcschemes/xcschememanagement.plist | 2 +- .../ios/Stone Island.xcarchive/Info.plist | 6 +- .../Applications/Stone Island.app/Assets.car | Bin 844136 -> 844136 bytes .../01J-lp-oVM-view-Ze5-6b-2t3.nib | Bin 2284 -> 2285 bytes .../UIViewController-01J-lp-oVM.nib | Bin 832 -> 832 bytes .../Applications/Stone Island.app/Info.plist | Bin 1698 -> 1698 bytes .../Stone Island.app/MainViewController.nib | Bin 943 -> 943 bytes .../Applications/Stone Island.app/Stone Island | Bin 2224144 -> 2224144 bytes .../Stone Island.app/_CodeSignature/CodeResources | 74 ++++++++++----------- .../Applications/Stone Island.app/config.xml | 2 +- .../Applications/Stone Island.app/www/js/index.js | 4 +- .../www/js/lib/account/AccountView.js | 17 +++-- .../Stone Island.app/www/js/lib/blogs/HubView.js | 2 +- .../Stone Island.app/www/js/lib/etc/deeplink.js | 1 + .../Stone Island.app/www/js/lib/etc/push.js | 1 + .../www/js/lib/view/Serializable.js | 2 +- .../Stone Island.app/www/js/sdk/_sdk.js | 4 +- .../xcschemes/xcschememanagement.plist | 2 +- .../UserInterfaceState.xcuserstate | Bin 65892 -> 65859 bytes .../ios/Stone Island/Stone Island-Info.plist | 4 +- StoneIsland/platforms/ios/Stone Island/config.xml | 2 +- StoneIsland/platforms/ios/www/js/index.js | 4 +- .../ios/www/js/lib/account/AccountView.js | 17 +++-- .../platforms/ios/www/js/lib/blogs/HubView.js | 2 +- .../platforms/ios/www/js/lib/etc/deeplink.js | 1 + StoneIsland/platforms/ios/www/js/lib/etc/push.js | 1 + .../platforms/ios/www/js/lib/view/Serializable.js | 2 +- StoneIsland/platforms/ios/www/js/sdk/_sdk.js | 4 +- StoneIsland/www/js/index.js | 4 +- StoneIsland/www/js/lib/account/AccountView.js | 17 +++-- StoneIsland/www/js/lib/blogs/HubView.js | 2 +- StoneIsland/www/js/lib/etc/deeplink.js | 1 + StoneIsland/www/js/lib/etc/push.js | 1 + StoneIsland/www/js/lib/view/Serializable.js | 2 +- StoneIsland/www/js/sdk/_sdk.js | 4 +- 36 files changed, 104 insertions(+), 83 deletions(-) diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index 46df452f..391a8b14 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -1,5 +1,5 @@ - + Stone Island Stone Island diff --git a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist index 54b0db05..daa4d171 100644 --- a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,7 +12,7 @@ CordovaLib.xcscheme orderHint - 3 + 2 diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 168228f1..1fad075a 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -9,16 +9,16 @@ CFBundleIdentifier us.okfoc.stoneisland CFBundleShortVersionString - 0.9.4 + 0.9.5 CFBundleVersion - 0.9.4 + 0.9.5 SigningIdentity iPhone Developer: Francesca Agusani (3ECUPBTQ5W) ArchiveVersion 2 CreationDate - 2017-11-23T17:22:19Z + 2017-11-24T00:23:16Z Name Stone Island SchemeName 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 index c847e816..b28e7af4 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car differ 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 index ef87d8c3..e4ec30c1 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib differ 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 index 85683102..af704106 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib differ 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 index 64c1a639..d4030a05 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist differ 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 index 8da56275..330be74e 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib differ 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 index 930f5576..9c5d630d 100755 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island differ 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 356af666..6621da07 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 @@ -94,11 +94,11 @@ Assets.car - 1plhUFv95vhLkJ3FIqDiwBok7qM= + mU3+fFB1l6DUPqTW9VycEL3pEcw= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - 9pa1QYbBnY/JeFTyzveLmEJc1K4= + P2Sos4goGvsG6ZfcA2e2ItlTQtY= CDVLaunchScreen.storyboardc/Info.plist @@ -106,7 +106,7 @@ CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - Kc0MQGfcRoyof0zyi3p2JUW9KsA= + 9KcWXvKLwM0ZVmwGJjpF4eREemE= CDVNotification.bundle/beep.wav @@ -114,11 +114,11 @@ Info.plist - Y4W/xAxkmVASaGa3t5+LpU1posc= + 36ZrERw9cWhqRg8Nu46wiDivw64= MainViewController.nib - 1sGNrBm186cvQZ7vrA0crZFtZB4= + bHrDUfunLdxx8iwLnMAIGKwockg= PkgInfo @@ -130,7 +130,7 @@ config.xml - N8yIit9kFw6PLTcCBgQanuVvOtU= + 8Pt1T+oGeJBSlGfmN9XLpSdqP58= embedded.mobileprovision @@ -354,7 +354,7 @@ www/js/index.js - wOXzRHktU04rH4QKjeb0Xz8WDHY= + NJmDFFvqR27okTny9pkYSJjb3UI= www/js/lib/_router.js @@ -362,7 +362,7 @@ www/js/lib/account/AccountView.js - FQRFGy9bd7XAXv5dq/h24YKnfAc= + p7ebS62KPkR8FJlihLEuRBm12Kw= www/js/lib/account/OrdersView.js @@ -406,7 +406,7 @@ www/js/lib/blogs/HubView.js - 0cUIKCgMsQFvYYF4ogB/zjvSIGs= + luEFl2azLXI4GqM5qKF7ePgcKAY= www/js/lib/blogs/PageView.js @@ -450,7 +450,7 @@ www/js/lib/etc/deeplink.js - Xjr3J9pMm16R4X4Ez0w2889N4Is= + ZaK0TX/YBC60SRkcsVWgeiWUpNY= www/js/lib/etc/geo.js @@ -458,7 +458,7 @@ www/js/lib/etc/push.js - +3CWZcxp1Ao9A/4KiM4nA82Hia8= + S3BYTiQmx8AAdMwzSDt/U2wLtwA= www/js/lib/etc/sim.js @@ -538,7 +538,7 @@ www/js/lib/view/Serializable.js - HcvpNe32BCqGsi0mvTv9mhmu+gw= + HsrjyaZKjUturToRQAVis8D/QRk= www/js/lib/view/View.js @@ -546,7 +546,7 @@ www/js/sdk/_sdk.js - p+aPqpbTEwmY/5eb/F9NF58t0W8= + 7I9q8zztUZpu863BewpO2gfhu3s= www/js/sdk/account.js @@ -937,22 +937,22 @@ hash - 1plhUFv95vhLkJ3FIqDiwBok7qM= + mU3+fFB1l6DUPqTW9VycEL3pEcw= hash2 - QXwF9xGgwE1QMgowMjtcGXJuEVRcKoiwCyMws9oNSNY= + 2jDzAlkFqWknrOaInuiqw6/7o09Ix89HcUCLi7rLBEg= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib hash - 9pa1QYbBnY/JeFTyzveLmEJc1K4= + P2Sos4goGvsG6ZfcA2e2ItlTQtY= hash2 - 8lQ5+AYo3GbvAPj4F4uahvG3qlijyFwrVqTBTNy1/wI= + 4BZMYuC44Q5dxXT8b1fnZXOa1dIBU1L4mPjWlAMLM5g= CDVLaunchScreen.storyboardc/Info.plist @@ -970,11 +970,11 @@ hash - Kc0MQGfcRoyof0zyi3p2JUW9KsA= + 9KcWXvKLwM0ZVmwGJjpF4eREemE= hash2 - 4/JwTjOvSTxDx7NCzcdebrcHaQMUBNdi/lGme5UW+fs= + 8jqKYpqyWlKi8L2nWHWsb9DL+jddLwGoiyjLU+BJqfk= CDVNotification.bundle/beep.wav @@ -992,11 +992,11 @@ hash - 1sGNrBm186cvQZ7vrA0crZFtZB4= + bHrDUfunLdxx8iwLnMAIGKwockg= hash2 - Z5p27GVRbSbBPZh5O50+TX7ubptG2SNlW5yvVV6/wkE= + CfD2qcwX4cWIMUzzjFmgEP791Y+KEwryKaKmMVzyp4Q= archived-expanded-entitlements.xcent @@ -1014,11 +1014,11 @@ hash - N8yIit9kFw6PLTcCBgQanuVvOtU= + 8Pt1T+oGeJBSlGfmN9XLpSdqP58= hash2 - 55AqJkugW0J3/irDyMxhibNJ3PjvmnTwU+vIi4sL3BQ= + HvAJxf6K5K3finU1kmSryi4xBG2E3I/4B267jkrk7LE= embedded.mobileprovision @@ -1630,11 +1630,11 @@ hash - wOXzRHktU04rH4QKjeb0Xz8WDHY= + NJmDFFvqR27okTny9pkYSJjb3UI= hash2 - kmyYZ5GdiBKABgetHNxZUE09E9OtKoslDFP4bUYMdfQ= + G2W5NCVZ1jLjYGv9nUevGrmzmR91h3K4OOOdMsu22bU= www/js/lib/_router.js @@ -1652,11 +1652,11 @@ hash - FQRFGy9bd7XAXv5dq/h24YKnfAc= + p7ebS62KPkR8FJlihLEuRBm12Kw= hash2 - Gq22+oA/SIt+uM1ek0tdmQi3tfYEdeoJ3GLvl1sgee4= + tg0eztCkKLdRjSLIzxppW7iHt9Lu2ZXnHOwsN5sUTcc= www/js/lib/account/OrdersView.js @@ -1773,11 +1773,11 @@ hash - 0cUIKCgMsQFvYYF4ogB/zjvSIGs= + luEFl2azLXI4GqM5qKF7ePgcKAY= hash2 - f/JUaOSBmGwW5INjPuviuIMrGf3sdzH3c/gwNr3pGiI= + cRt+q8GqIgxugNl7hJi83sX78+GUgho46RHH9fyb93g= www/js/lib/blogs/PageView.js @@ -1894,11 +1894,11 @@ hash - Xjr3J9pMm16R4X4Ez0w2889N4Is= + ZaK0TX/YBC60SRkcsVWgeiWUpNY= hash2 - dwd1KWvpTJljBVWokg9OGGiAbSMHP2o5wW87A00AXLg= + mX5AssMNwLdaBGropRT6esU7NcOn8qQvogwqHvaZ2BA= www/js/lib/etc/geo.js @@ -1916,11 +1916,11 @@ hash - +3CWZcxp1Ao9A/4KiM4nA82Hia8= + S3BYTiQmx8AAdMwzSDt/U2wLtwA= hash2 - 1kY0DEwWFQO8RFoncYf/51g2MWyKHwesCyP/Nt7xDXk= + RC/CFEKF4Oq0QGswyOE+OOmSn4VUAmgi7aoXzImOA00= www/js/lib/etc/sim.js @@ -2136,11 +2136,11 @@ hash - HcvpNe32BCqGsi0mvTv9mhmu+gw= + HsrjyaZKjUturToRQAVis8D/QRk= hash2 - u/8xbatpFl4B4QGpfHNyyG08MJVjwqGm3/8ImDPD7g8= + sRT9yuLhOiEsHWojXIKwpmOTqVMelaZe9zHooWhUwPo= www/js/lib/view/View.js @@ -2158,11 +2158,11 @@ hash - p+aPqpbTEwmY/5eb/F9NF58t0W8= + 7I9q8zztUZpu863BewpO2gfhu3s= hash2 - 6LahOUZ7IdibY4LB9/x3om63z+ItHu6FvkvgNFQ4k0s= + YGEYcUsNin1H1P3vJFeOUlYHalUyKxitCMYxinYumgY= www/js/sdk/account.js 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 f39544db..0d188827 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 @@ - + diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js index 511849ad..72584894 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/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/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js index 73637cd1..04dfa828 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/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/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/HubView.js index ad0fd9b0..20046fdf 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/blogs/HubView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/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/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/deeplink.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/deeplink.js index 7667cfcd..fc3b52a9 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/deeplink.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/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/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 29d2938f..746172eb 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 @@ -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/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/view/Serializable.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/view/Serializable.js index ae0a4fbc..de5fe951 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/view/Serializable.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/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/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/sdk/_sdk.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/sdk/_sdk.js index fc871727..aa342ffa 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/sdk/_sdk.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/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({ diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist index 371cb20d..d744b66e 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ Stone Island.xcscheme orderHint - 2 + 3 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 index 176af929..fc19cd9e 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate and b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index ebb20ff6..34809b7a 100644 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -21,11 +21,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.4 + 0.9.5 CFBundleSignature ???? CFBundleVersion - 0.9.4 + 0.9.5 LSRequiresIPhoneOS NSMainNibFile diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index f39544db..0d188827 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -1,5 +1,5 @@ - + 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({ diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js index 511849ad..72584894 100755 --- a/StoneIsland/www/js/index.js +++ b/StoneIsland/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/www/js/lib/account/AccountView.js b/StoneIsland/www/js/lib/account/AccountView.js index 73637cd1..04dfa828 100755 --- a/StoneIsland/www/js/lib/account/AccountView.js +++ b/StoneIsland/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/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js index ad0fd9b0..20046fdf 100755 --- a/StoneIsland/www/js/lib/blogs/HubView.js +++ b/StoneIsland/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/www/js/lib/etc/deeplink.js b/StoneIsland/www/js/lib/etc/deeplink.js index 7667cfcd..fc3b52a9 100755 --- a/StoneIsland/www/js/lib/etc/deeplink.js +++ b/StoneIsland/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/www/js/lib/etc/push.js b/StoneIsland/www/js/lib/etc/push.js index 29d2938f..746172eb 100755 --- a/StoneIsland/www/js/lib/etc/push.js +++ b/StoneIsland/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/www/js/lib/view/Serializable.js b/StoneIsland/www/js/lib/view/Serializable.js index ae0a4fbc..de5fe951 100755 --- a/StoneIsland/www/js/lib/view/Serializable.js +++ b/StoneIsland/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/www/js/sdk/_sdk.js b/StoneIsland/www/js/sdk/_sdk.js index fc871727..aa342ffa 100755 --- a/StoneIsland/www/js/sdk/_sdk.js +++ b/StoneIsland/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({ -- cgit v1.2.3-70-g09d2