Merge pull request exonum#114 from boguslavsky/fix-first-login

fix modal hide on register
xfireon · Mar 22, 2018 · 7734423 · 7734423
2 parents 2f3722e + c489533
commit 7734423
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/frontend/src/components/Modal.vue b/frontend/src/components/Modal.vue
@@ -31,14 +31,6 @@
 <script>
   const className = 'modal-open'
 
-  function toggle(state) {
-    if (state) {
-      document.body.classList.add(className)
-    } else {
-      document.body.classList.remove(className)
-    }
-  }
-
   module.exports = {
     name: 'modal',
     props: {
@@ -47,19 +39,30 @@
       visible: Boolean
     },
     watch: {
-      visible: toggle
+      visible: function(value) {
+        this.toggle(value)
+      }
     },
     methods: {
       close: function() {
         this.$emit('close')
       },
+
       submit: function() {
         this.$emit('submit')
+      },
+
+      toggle: function(state) {
+        if (state) {
+          document.body.classList.add(className)
+        } else {
+          document.body.classList.remove(className)
+        }
       }
     },
     mounted: function() {
       this.$nextTick(function() {
-        toggle(false)
+        this.toggle(false)
       })
     }
   }

diff --git a/frontend/src/components/Tabs.vue b/frontend/src/components/Tabs.vue
@@ -31,6 +31,7 @@
           this.current = tab
         }
       },
+
       changeTab: function(tab) {
         this.current = tab
         this.tabs.forEach(value => {

diff --git a/frontend/src/pages/Auth.vue b/frontend/src/pages/Auth.vue
@@ -117,7 +117,9 @@
 
         this.$storage.set(this.keyPair)
 
-        this.$router.push({name: 'user'})
+        this.$nextTick(function() {
+          this.$router.push({name: 'user'})
+        })
       }
     }
   }