summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2017-11-24 17:44:00 +0100
committerJules Laplace <julescarbon@gmail.com>2017-11-24 17:44:00 +0100
commit163d269eef310617a23b6b8be8270b44794dd723 (patch)
treeb647970281e8e89c1a976fbae12ed30e19e6db57
parent4380488815fa9dfe899fbacf71f5e0848544dd37 (diff)
deep linking working
-rw-r--r--StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist2
-rw-r--r--StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.carbin844136 -> 844136 bytes
-rw-r--r--StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nibbin2285 -> 2282 bytes
-rw-r--r--StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nibbin832 -> 832 bytes
-rw-r--r--StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nibbin943 -> 943 bytes
-rwxr-xr-xStoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Islandbin2224144 -> 2224144 bytes
-rw-r--r--StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources24
-rw-r--r--StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstatebin65859 -> 99601 bytes
-rwxr-xr-xStoneIsland/platforms/ios/www/js/index.js1
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/account/AccountView.js1
-rwxr-xr-xStoneIsland/www/js/index.js1
-rwxr-xr-xStoneIsland/www/js/lib/account/AccountView.js1
12 files changed, 17 insertions, 13 deletions
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist
index 1fad075a..93b9b844 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-11-24T00:23:16Z</date>
+ <date>2017-11-24T00:24:36Z</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
index b28e7af4..b48b5463 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
Binary files 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 e4ec30c1..1bcaa74a 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
Binary files 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 af704106..d5551eeb 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
Binary files 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 330be74e..2c66a363 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
Binary files 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 9c5d630d..bd28f42b 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
Binary files 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 6621da07..b5c3ed2b 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 @@
</data>
<key>Assets.car</key>
<data>
- mU3+fFB1l6DUPqTW9VycEL3pEcw=
+ /Qnxj3RbFIKFHnnqBCjvII0MaPM=
</data>
<key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
<data>
- P2Sos4goGvsG6ZfcA2e2ItlTQtY=
+ zrGvhNy2G3ukIlizgyHirVRpcTc=
</data>
<key>CDVLaunchScreen.storyboardc/Info.plist</key>
<data>
@@ -106,7 +106,7 @@
</data>
<key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key>
<data>
- 9KcWXvKLwM0ZVmwGJjpF4eREemE=
+ RMTu40kyT4csaSiWzUaDnv29cpc=
</data>
<key>CDVNotification.bundle/beep.wav</key>
<data>
@@ -118,7 +118,7 @@
</data>
<key>MainViewController.nib</key>
<data>
- bHrDUfunLdxx8iwLnMAIGKwockg=
+ 7aHxq3bQbEcUPlt3KDvkLiJc4mo=
</data>
<key>PkgInfo</key>
<data>
@@ -937,22 +937,22 @@
<dict>
<key>hash</key>
<data>
- mU3+fFB1l6DUPqTW9VycEL3pEcw=
+ /Qnxj3RbFIKFHnnqBCjvII0MaPM=
</data>
<key>hash2</key>
<data>
- 2jDzAlkFqWknrOaInuiqw6/7o09Ix89HcUCLi7rLBEg=
+ 0PSwR5iuvNevwaETo97WZuZnGNbV84xXj/4BrBOUOLg=
</data>
</dict>
<key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
<dict>
<key>hash</key>
<data>
- P2Sos4goGvsG6ZfcA2e2ItlTQtY=
+ zrGvhNy2G3ukIlizgyHirVRpcTc=
</data>
<key>hash2</key>
<data>
- 4BZMYuC44Q5dxXT8b1fnZXOa1dIBU1L4mPjWlAMLM5g=
+ TD8MMJbubFYBrlAgtFn/3deJvOGDdKVXkqOmLQY+tjs=
</data>
</dict>
<key>CDVLaunchScreen.storyboardc/Info.plist</key>
@@ -970,11 +970,11 @@
<dict>
<key>hash</key>
<data>
- 9KcWXvKLwM0ZVmwGJjpF4eREemE=
+ RMTu40kyT4csaSiWzUaDnv29cpc=
</data>
<key>hash2</key>
<data>
- 8jqKYpqyWlKi8L2nWHWsb9DL+jddLwGoiyjLU+BJqfk=
+ sTv1pmeHPsoGu1Cs8q4O3gTZY0oubcU4Lo996XEW3JE=
</data>
</dict>
<key>CDVNotification.bundle/beep.wav</key>
@@ -992,11 +992,11 @@
<dict>
<key>hash</key>
<data>
- bHrDUfunLdxx8iwLnMAIGKwockg=
+ 7aHxq3bQbEcUPlt3KDvkLiJc4mo=
</data>
<key>hash2</key>
<data>
- CfD2qcwX4cWIMUzzjFmgEP791Y+KEwryKaKmMVzyp4Q=
+ OrPil0acrFjh/PzokwEAxNuRn7/6cj7PaMrdPMztDXY=
</data>
</dict>
<key>archived-expanded-entitlements.xcent</key>
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 fc19cd9e..dbfbfbc5 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
Binary files differ
diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js
index 72584894..4cae2f24 100755
--- a/StoneIsland/platforms/ios/www/js/index.js
+++ b/StoneIsland/platforms/ios/www/js/index.js
@@ -105,6 +105,7 @@ var app = (function(){
if (navigator.onLine) {
app.account.connect(app.deepLinkRoute || '/intro')
app.blog.fetch(function(){
+ console.log("navigating to deep link route after fetch")
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 04dfa828..4a6ff9e0 100755
--- a/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js
@@ -128,6 +128,7 @@ var AccountView = View.extend({
}
else {
if (initialLoginPath) {
+ console.log("navigating to deep link route from logged_in")
app.router.go(initialLoginPath)
}
else {
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index 72584894..4cae2f24 100755
--- a/StoneIsland/www/js/index.js
+++ b/StoneIsland/www/js/index.js
@@ -105,6 +105,7 @@ var app = (function(){
if (navigator.onLine) {
app.account.connect(app.deepLinkRoute || '/intro')
app.blog.fetch(function(){
+ console.log("navigating to deep link route after fetch")
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 04dfa828..4a6ff9e0 100755
--- a/StoneIsland/www/js/lib/account/AccountView.js
+++ b/StoneIsland/www/js/lib/account/AccountView.js
@@ -128,6 +128,7 @@ var AccountView = View.extend({
}
else {
if (initialLoginPath) {
+ console.log("navigating to deep link route from logged_in")
app.router.go(initialLoginPath)
}
else {