summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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.nibbin2282 -> 2285 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/CodeResources42
-rwxr-xr-xStoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js8
-rwxr-xr-xStoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js1
-rwxr-xr-xStoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/deeplink.js4
-rw-r--r--StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstatebin99601 -> 111874 bytes
-rwxr-xr-xStoneIsland/platforms/ios/www/js/index.js7
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/etc/deeplink.js4
-rwxr-xr-xStoneIsland/www/js/index.js7
-rwxr-xr-xStoneIsland/www/js/lib/etc/deeplink.js4
15 files changed, 45 insertions, 34 deletions
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist
index 93b9b844..585097f5 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:24:36Z</date>
+ <date>2017-11-24T16:58:04Z</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 b48b5463..970736c0 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 1bcaa74a..0f71bc55 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 d5551eeb..615d8527 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 2c66a363..1b87f5e0 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 bd28f42b..cfcd27da 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 b5c3ed2b..b2314b25 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>
- /Qnxj3RbFIKFHnnqBCjvII0MaPM=
+ g/shlZXXT+5YqMmZSYPmC64TQK0=
</data>
<key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
<data>
- zrGvhNy2G3ukIlizgyHirVRpcTc=
+ XKRpTIL+5+qWUTNCfMrloqXol+o=
</data>
<key>CDVLaunchScreen.storyboardc/Info.plist</key>
<data>
@@ -106,7 +106,7 @@
</data>
<key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key>
<data>
- RMTu40kyT4csaSiWzUaDnv29cpc=
+ MFJLtjYuQtDJx/38DlBSTD+pBf8=
</data>
<key>CDVNotification.bundle/beep.wav</key>
<data>
@@ -118,7 +118,7 @@
</data>
<key>MainViewController.nib</key>
<data>
- 7aHxq3bQbEcUPlt3KDvkLiJc4mo=
+ WPhCUF01tBcP0CKRq9fFQt/+T2Q=
</data>
<key>PkgInfo</key>
<data>
@@ -354,7 +354,7 @@
</data>
<key>www/js/index.js</key>
<data>
- NJmDFFvqR27okTny9pkYSJjb3UI=
+ XgJhs0VV6cJQmVhMxypE070GJsU=
</data>
<key>www/js/lib/_router.js</key>
<data>
@@ -362,7 +362,7 @@
</data>
<key>www/js/lib/account/AccountView.js</key>
<data>
- p7ebS62KPkR8FJlihLEuRBm12Kw=
+ 1IB9e7i4hutrfSxVEZ2fy8G06AE=
</data>
<key>www/js/lib/account/OrdersView.js</key>
<data>
@@ -450,7 +450,7 @@
</data>
<key>www/js/lib/etc/deeplink.js</key>
<data>
- ZaK0TX/YBC60SRkcsVWgeiWUpNY=
+ Hz8iJCB2rav1z51mh2bp5fnQwbs=
</data>
<key>www/js/lib/etc/geo.js</key>
<data>
@@ -937,22 +937,22 @@
<dict>
<key>hash</key>
<data>
- /Qnxj3RbFIKFHnnqBCjvII0MaPM=
+ g/shlZXXT+5YqMmZSYPmC64TQK0=
</data>
<key>hash2</key>
<data>
- 0PSwR5iuvNevwaETo97WZuZnGNbV84xXj/4BrBOUOLg=
+ JnNHKritXF3c9xz7oU5A9kgMvDRsGDByjuDTjr4NGrI=
</data>
</dict>
<key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
<dict>
<key>hash</key>
<data>
- zrGvhNy2G3ukIlizgyHirVRpcTc=
+ XKRpTIL+5+qWUTNCfMrloqXol+o=
</data>
<key>hash2</key>
<data>
- TD8MMJbubFYBrlAgtFn/3deJvOGDdKVXkqOmLQY+tjs=
+ bBdqkQNpiqV6vnraDiYfFiYK2a9/CzqPEIXcLAyfh28=
</data>
</dict>
<key>CDVLaunchScreen.storyboardc/Info.plist</key>
@@ -970,11 +970,11 @@
<dict>
<key>hash</key>
<data>
- RMTu40kyT4csaSiWzUaDnv29cpc=
+ MFJLtjYuQtDJx/38DlBSTD+pBf8=
</data>
<key>hash2</key>
<data>
- sTv1pmeHPsoGu1Cs8q4O3gTZY0oubcU4Lo996XEW3JE=
+ ltZ05E70S7J1bZd2eKH259Zgsxr2TxcV856f7LLg4C4=
</data>
</dict>
<key>CDVNotification.bundle/beep.wav</key>
@@ -992,11 +992,11 @@
<dict>
<key>hash</key>
<data>
- 7aHxq3bQbEcUPlt3KDvkLiJc4mo=
+ WPhCUF01tBcP0CKRq9fFQt/+T2Q=
</data>
<key>hash2</key>
<data>
- OrPil0acrFjh/PzokwEAxNuRn7/6cj7PaMrdPMztDXY=
+ G+OjKp457/9c9jlWaSDoE0JsxdCIVdb/7pTnv3Nm5K0=
</data>
</dict>
<key>archived-expanded-entitlements.xcent</key>
@@ -1630,11 +1630,11 @@
<dict>
<key>hash</key>
<data>
- NJmDFFvqR27okTny9pkYSJjb3UI=
+ XgJhs0VV6cJQmVhMxypE070GJsU=
</data>
<key>hash2</key>
<data>
- G2W5NCVZ1jLjYGv9nUevGrmzmR91h3K4OOOdMsu22bU=
+ n1pWw6MNDrVQW6cXPmMapfIrKZ1W1RJY3PRmwT/UvdE=
</data>
</dict>
<key>www/js/lib/_router.js</key>
@@ -1652,11 +1652,11 @@
<dict>
<key>hash</key>
<data>
- p7ebS62KPkR8FJlihLEuRBm12Kw=
+ 1IB9e7i4hutrfSxVEZ2fy8G06AE=
</data>
<key>hash2</key>
<data>
- tg0eztCkKLdRjSLIzxppW7iHt9Lu2ZXnHOwsN5sUTcc=
+ e4ehiZ+tIfSc/UKQO/NQffM4xs4qEPPoXG4gw7Bo6nc=
</data>
</dict>
<key>www/js/lib/account/OrdersView.js</key>
@@ -1894,11 +1894,11 @@
<dict>
<key>hash</key>
<data>
- ZaK0TX/YBC60SRkcsVWgeiWUpNY=
+ Hz8iJCB2rav1z51mh2bp5fnQwbs=
</data>
<key>hash2</key>
<data>
- mX5AssMNwLdaBGropRT6esU7NcOn8qQvogwqHvaZ2BA=
+ tNwo1x6uGh01AKZD6QN09Bk65P1LrEhZKZ3g5fow+5c=
</data>
</dict>
<key>www/js/lib/etc/geo.js</key>
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 72584894..164d98cc 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,10 @@ var app = (function(){
// }
if (navigator.onLine) {
- app.account.connect(app.deepLinkRoute || '/intro')
+ app.account.connect(window.deepLinkRoute || '/intro')
app.blog.fetch(function(){
- app.router.initial_route = app.deepLinkRoute || "/intro"
+ console.log("navigating to deep link route after fetch")
+ app.router.initial_route = window.deepLinkRoute || "/intro"
app.router.launch()
})
}
@@ -123,6 +124,9 @@ var app = (function(){
if (window.cordova) {
navigator.splashscreen.hide()
}
+ if (window.deepLinkRoute) {
+ app.router.go(window.deepLinkRoute)
+ }
$("body").removeClass("loading")
}
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 04dfa828..4a6ff9e0 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
@@ -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/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 fc3b52a9..252a94c9 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
@@ -1,6 +1,6 @@
function handleOpenURL (url) {
console.log("DEEP LINKING DETECTED", url)
url = url.replace("stoneisland:/", "")
- app.router.parseRoute( url )
- app.deepLinkRoute = url
+ app.router && app.router.parseRoute( url )
+ window.deepLinkRoute = url
} \ No newline at end of file
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 dbfbfbc5..2633e608 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 4cae2f24..164d98cc 100755
--- a/StoneIsland/platforms/ios/www/js/index.js
+++ b/StoneIsland/platforms/ios/www/js/index.js
@@ -103,10 +103,10 @@ var app = (function(){
// }
if (navigator.onLine) {
- app.account.connect(app.deepLinkRoute || '/intro')
+ app.account.connect(window.deepLinkRoute || '/intro')
app.blog.fetch(function(){
console.log("navigating to deep link route after fetch")
- app.router.initial_route = app.deepLinkRoute || "/intro"
+ app.router.initial_route = window.deepLinkRoute || "/intro"
app.router.launch()
})
}
@@ -124,6 +124,9 @@ var app = (function(){
if (window.cordova) {
navigator.splashscreen.hide()
}
+ if (window.deepLinkRoute) {
+ app.router.go(window.deepLinkRoute)
+ }
$("body").removeClass("loading")
}
diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/deeplink.js b/StoneIsland/platforms/ios/www/js/lib/etc/deeplink.js
index fc3b52a9..252a94c9 100755
--- a/StoneIsland/platforms/ios/www/js/lib/etc/deeplink.js
+++ b/StoneIsland/platforms/ios/www/js/lib/etc/deeplink.js
@@ -1,6 +1,6 @@
function handleOpenURL (url) {
console.log("DEEP LINKING DETECTED", url)
url = url.replace("stoneisland:/", "")
- app.router.parseRoute( url )
- app.deepLinkRoute = url
+ app.router && app.router.parseRoute( url )
+ window.deepLinkRoute = url
} \ No newline at end of file
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index 4cae2f24..164d98cc 100755
--- a/StoneIsland/www/js/index.js
+++ b/StoneIsland/www/js/index.js
@@ -103,10 +103,10 @@ var app = (function(){
// }
if (navigator.onLine) {
- app.account.connect(app.deepLinkRoute || '/intro')
+ app.account.connect(window.deepLinkRoute || '/intro')
app.blog.fetch(function(){
console.log("navigating to deep link route after fetch")
- app.router.initial_route = app.deepLinkRoute || "/intro"
+ app.router.initial_route = window.deepLinkRoute || "/intro"
app.router.launch()
})
}
@@ -124,6 +124,9 @@ var app = (function(){
if (window.cordova) {
navigator.splashscreen.hide()
}
+ if (window.deepLinkRoute) {
+ app.router.go(window.deepLinkRoute)
+ }
$("body").removeClass("loading")
}
diff --git a/StoneIsland/www/js/lib/etc/deeplink.js b/StoneIsland/www/js/lib/etc/deeplink.js
index fc3b52a9..252a94c9 100755
--- a/StoneIsland/www/js/lib/etc/deeplink.js
+++ b/StoneIsland/www/js/lib/etc/deeplink.js
@@ -1,6 +1,6 @@
function handleOpenURL (url) {
console.log("DEEP LINKING DETECTED", url)
url = url.replace("stoneisland:/", "")
- app.router.parseRoute( url )
- app.deepLinkRoute = url
+ app.router && app.router.parseRoute( url )
+ window.deepLinkRoute = url
} \ No newline at end of file