diff options
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 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-versionCode="6094" id="us.okfoc.stoneisland" version="0.9.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-versionCode="6095" id="us.okfoc.stoneisland" version="0.9.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>Stone Island</name> <description> 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 @@ <key>CordovaLib.xcscheme</key> <dict> <key>orderHint</key> - <integer>3</integer> + <integer>2</integer> </dict> </dict> </dict> 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 @@ <key>CFBundleIdentifier</key> <string>us.okfoc.stoneisland</string> <key>CFBundleShortVersionString</key> - <string>0.9.4</string> + <string>0.9.5</string> <key>CFBundleVersion</key> - <string>0.9.4</string> + <string>0.9.5</string> <key>SigningIdentity</key> <string>iPhone Developer: Francesca Agusani (3ECUPBTQ5W)</string> </dict> <key>ArchiveVersion</key> <integer>2</integer> <key>CreationDate</key> - <date>2017-11-23T17:22:19Z</date> + <date>2017-11-24T00:23:16Z</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 Binary files differindex c847e816..b28e7af4 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 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 Binary files differindex ef87d8c3..e4ec30c1 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 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 Binary files differindex 85683102..af704106 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 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 Binary files differindex 64c1a639..d4030a05 100644 --- 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 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 Binary files differindex 8da56275..330be74e 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 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 Binary files differindex 930f5576..9c5d630d 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 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 @@ </data> <key>Assets.car</key> <data> - 1plhUFv95vhLkJ3FIqDiwBok7qM= + mU3+fFB1l6DUPqTW9VycEL3pEcw= </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <data> - 9pa1QYbBnY/JeFTyzveLmEJc1K4= + P2Sos4goGvsG6ZfcA2e2ItlTQtY= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -106,7 +106,7 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key> <data> - Kc0MQGfcRoyof0zyi3p2JUW9KsA= + 9KcWXvKLwM0ZVmwGJjpF4eREemE= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -114,11 +114,11 @@ </data> <key>Info.plist</key> <data> - Y4W/xAxkmVASaGa3t5+LpU1posc= + 36ZrERw9cWhqRg8Nu46wiDivw64= </data> <key>MainViewController.nib</key> <data> - 1sGNrBm186cvQZ7vrA0crZFtZB4= + bHrDUfunLdxx8iwLnMAIGKwockg= </data> <key>PkgInfo</key> <data> @@ -130,7 +130,7 @@ </data> <key>config.xml</key> <data> - N8yIit9kFw6PLTcCBgQanuVvOtU= + 8Pt1T+oGeJBSlGfmN9XLpSdqP58= </data> <key>embedded.mobileprovision</key> <data> @@ -354,7 +354,7 @@ </data> <key>www/js/index.js</key> <data> - wOXzRHktU04rH4QKjeb0Xz8WDHY= + NJmDFFvqR27okTny9pkYSJjb3UI= </data> <key>www/js/lib/_router.js</key> <data> @@ -362,7 +362,7 @@ </data> <key>www/js/lib/account/AccountView.js</key> <data> - FQRFGy9bd7XAXv5dq/h24YKnfAc= + p7ebS62KPkR8FJlihLEuRBm12Kw= </data> <key>www/js/lib/account/OrdersView.js</key> <data> @@ -406,7 +406,7 @@ </data> <key>www/js/lib/blogs/HubView.js</key> <data> - 0cUIKCgMsQFvYYF4ogB/zjvSIGs= + luEFl2azLXI4GqM5qKF7ePgcKAY= </data> <key>www/js/lib/blogs/PageView.js</key> <data> @@ -450,7 +450,7 @@ </data> <key>www/js/lib/etc/deeplink.js</key> <data> - Xjr3J9pMm16R4X4Ez0w2889N4Is= + ZaK0TX/YBC60SRkcsVWgeiWUpNY= </data> <key>www/js/lib/etc/geo.js</key> <data> @@ -458,7 +458,7 @@ </data> <key>www/js/lib/etc/push.js</key> <data> - +3CWZcxp1Ao9A/4KiM4nA82Hia8= + S3BYTiQmx8AAdMwzSDt/U2wLtwA= </data> <key>www/js/lib/etc/sim.js</key> <data> @@ -538,7 +538,7 @@ </data> <key>www/js/lib/view/Serializable.js</key> <data> - HcvpNe32BCqGsi0mvTv9mhmu+gw= + HsrjyaZKjUturToRQAVis8D/QRk= </data> <key>www/js/lib/view/View.js</key> <data> @@ -546,7 +546,7 @@ </data> <key>www/js/sdk/_sdk.js</key> <data> - p+aPqpbTEwmY/5eb/F9NF58t0W8= + 7I9q8zztUZpu863BewpO2gfhu3s= </data> <key>www/js/sdk/account.js</key> <data> @@ -937,22 +937,22 @@ <dict> <key>hash</key> <data> - 1plhUFv95vhLkJ3FIqDiwBok7qM= + mU3+fFB1l6DUPqTW9VycEL3pEcw= </data> <key>hash2</key> <data> - QXwF9xGgwE1QMgowMjtcGXJuEVRcKoiwCyMws9oNSNY= + 2jDzAlkFqWknrOaInuiqw6/7o09Ix89HcUCLi7rLBEg= </data> </dict> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <dict> <key>hash</key> <data> - 9pa1QYbBnY/JeFTyzveLmEJc1K4= + P2Sos4goGvsG6ZfcA2e2ItlTQtY= </data> <key>hash2</key> <data> - 8lQ5+AYo3GbvAPj4F4uahvG3qlijyFwrVqTBTNy1/wI= + 4BZMYuC44Q5dxXT8b1fnZXOa1dIBU1L4mPjWlAMLM5g= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -970,11 +970,11 @@ <dict> <key>hash</key> <data> - Kc0MQGfcRoyof0zyi3p2JUW9KsA= + 9KcWXvKLwM0ZVmwGJjpF4eREemE= </data> <key>hash2</key> <data> - 4/JwTjOvSTxDx7NCzcdebrcHaQMUBNdi/lGme5UW+fs= + 8jqKYpqyWlKi8L2nWHWsb9DL+jddLwGoiyjLU+BJqfk= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -992,11 +992,11 @@ <dict> <key>hash</key> <data> - 1sGNrBm186cvQZ7vrA0crZFtZB4= + bHrDUfunLdxx8iwLnMAIGKwockg= </data> <key>hash2</key> <data> - Z5p27GVRbSbBPZh5O50+TX7ubptG2SNlW5yvVV6/wkE= + CfD2qcwX4cWIMUzzjFmgEP791Y+KEwryKaKmMVzyp4Q= </data> </dict> <key>archived-expanded-entitlements.xcent</key> @@ -1014,11 +1014,11 @@ <dict> <key>hash</key> <data> - N8yIit9kFw6PLTcCBgQanuVvOtU= + 8Pt1T+oGeJBSlGfmN9XLpSdqP58= </data> <key>hash2</key> <data> - 55AqJkugW0J3/irDyMxhibNJ3PjvmnTwU+vIi4sL3BQ= + HvAJxf6K5K3finU1kmSryi4xBG2E3I/4B267jkrk7LE= </data> </dict> <key>embedded.mobileprovision</key> @@ -1630,11 +1630,11 @@ <dict> <key>hash</key> <data> - wOXzRHktU04rH4QKjeb0Xz8WDHY= + NJmDFFvqR27okTny9pkYSJjb3UI= </data> <key>hash2</key> <data> - kmyYZ5GdiBKABgetHNxZUE09E9OtKoslDFP4bUYMdfQ= + G2W5NCVZ1jLjYGv9nUevGrmzmR91h3K4OOOdMsu22bU= </data> </dict> <key>www/js/lib/_router.js</key> @@ -1652,11 +1652,11 @@ <dict> <key>hash</key> <data> - FQRFGy9bd7XAXv5dq/h24YKnfAc= + p7ebS62KPkR8FJlihLEuRBm12Kw= </data> <key>hash2</key> <data> - Gq22+oA/SIt+uM1ek0tdmQi3tfYEdeoJ3GLvl1sgee4= + tg0eztCkKLdRjSLIzxppW7iHt9Lu2ZXnHOwsN5sUTcc= </data> </dict> <key>www/js/lib/account/OrdersView.js</key> @@ -1773,11 +1773,11 @@ <dict> <key>hash</key> <data> - 0cUIKCgMsQFvYYF4ogB/zjvSIGs= + luEFl2azLXI4GqM5qKF7ePgcKAY= </data> <key>hash2</key> <data> - f/JUaOSBmGwW5INjPuviuIMrGf3sdzH3c/gwNr3pGiI= + cRt+q8GqIgxugNl7hJi83sX78+GUgho46RHH9fyb93g= </data> </dict> <key>www/js/lib/blogs/PageView.js</key> @@ -1894,11 +1894,11 @@ <dict> <key>hash</key> <data> - Xjr3J9pMm16R4X4Ez0w2889N4Is= + ZaK0TX/YBC60SRkcsVWgeiWUpNY= </data> <key>hash2</key> <data> - dwd1KWvpTJljBVWokg9OGGiAbSMHP2o5wW87A00AXLg= + mX5AssMNwLdaBGropRT6esU7NcOn8qQvogwqHvaZ2BA= </data> </dict> <key>www/js/lib/etc/geo.js</key> @@ -1916,11 +1916,11 @@ <dict> <key>hash</key> <data> - +3CWZcxp1Ao9A/4KiM4nA82Hia8= + S3BYTiQmx8AAdMwzSDt/U2wLtwA= </data> <key>hash2</key> <data> - 1kY0DEwWFQO8RFoncYf/51g2MWyKHwesCyP/Nt7xDXk= + RC/CFEKF4Oq0QGswyOE+OOmSn4VUAmgi7aoXzImOA00= </data> </dict> <key>www/js/lib/etc/sim.js</key> @@ -2136,11 +2136,11 @@ <dict> <key>hash</key> <data> - HcvpNe32BCqGsi0mvTv9mhmu+gw= + HsrjyaZKjUturToRQAVis8D/QRk= </data> <key>hash2</key> <data> - u/8xbatpFl4B4QGpfHNyyG08MJVjwqGm3/8ImDPD7g8= + sRT9yuLhOiEsHWojXIKwpmOTqVMelaZe9zHooWhUwPo= </data> </dict> <key>www/js/lib/view/View.js</key> @@ -2158,11 +2158,11 @@ <dict> <key>hash</key> <data> - p+aPqpbTEwmY/5eb/F9NF58t0W8= + 7I9q8zztUZpu863BewpO2gfhu3s= </data> <key>hash2</key> <data> - 6LahOUZ7IdibY4LB9/x3om63z+ItHu6FvkvgNFQ4k0s= + YGEYcUsNin1H1P3vJFeOUlYHalUyKxitCMYxinYumgY= </data> </dict> <key>www/js/sdk/account.js</key> 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 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-versionCode="6094" id="us.okfoc.stoneisland" version="0.9.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-versionCode="6095" id="us.okfoc.stoneisland" version="0.9.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <feature name="LocalStorage"> <param name="ios-package" value="CDVLocalStorage" /> </feature> 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 @@ <key>Stone Island.xcscheme</key> <dict> <key>orderHint</key> - <integer>2</integer> + <integer>3</integer> </dict> </dict> </dict> 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 Binary files differindex 176af929..fc19cd9e 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 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 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.9.4</string> + <string>0.9.5</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>0.9.4</string> + <string>0.9.5</string> <key>LSRequiresIPhoneOS</key> <true/> <key>NSMainNibFile</key> 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 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-versionCode="6094" id="us.okfoc.stoneisland" version="0.9.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-versionCode="6095" id="us.okfoc.stoneisland" version="0.9.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <feature name="LocalStorage"> <param name="ios-package" value="CDVLocalStorage" /> </feature> 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({ |