do everything we can to force lockout

2 files changed, 11 insertions, 4 deletions

diff --git a/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js b/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js
index 4605416c..8ac7c193 100755
--- a/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js
@@ -105,6 +105,7 @@ var AccountView = View.extend({
       cb && cb()
     }
     console.log('logged in')
+    app.account.consent.check()
     if ( ! auth.has_cart() ) {
       console.log('no cart')
       app.curtain.show("loading")
@@ -132,9 +133,10 @@ var AccountView = View.extend({
               console.log("navigating to deep link route from logged_in")
               app.router.go(initialLoginPath)
             }
-            else {
+            else if (!app.last_view) {
               app.router.go("account/profile")
             }
+            app.account.consent.check()
             app.curtain.hide("loading")
           }
         },
diff --git a/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js b/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js
index dfeb4fac..c9235498 100644
--- a/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js
+++ b/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js
@@ -18,11 +18,14 @@ var ConsentModal = View.extend({
 
   check: function(){
     var status = localStorage.getItem('account_terms.consent')
+    console.log('account_terms.consent', status)
     if (status !== 'true') {
+      console.log('we demand consent!')
       app.demand_consent = true
       this.show()
       return true
     } else {
+      console.log('already received consent!')
       this.hide()
       app.demand_consent = false
       return false
@@ -35,8 +38,10 @@ var ConsentModal = View.extend({
     setTimeout(function(){
       this.$el.addClass('visible')
     }.bind(this), 20)
-    app.curtain.show()
-    app.curtain.classList.add('opaque')
+    app.curtain.show('opaque')
+    setTimeout(function(){
+      app.curtain.show('opaque')
+    }, 300)
   },
 
   hide: function(){
@@ -44,7 +49,7 @@ var ConsentModal = View.extend({
     this.$el.removeClass('visible')
     setTimeout(function(){
       this.$el.hide()
-      app.curtain.classList.remove('opaque')
+      app.curtain.$el.removeClass('opaque')
     }.bind(this), 300)
   },