fixup! Hide private token by defaulthide-api-token

2 files changed, 9 insertions, 14 deletions

diff --git a/app/assets/javascripts/private_token_viewer.js.es6 b/app/assets/javascripts/private_token_viewer.js.es6
index 6c7cd436e37..47f3ebff50a 100644
--- a/app/assets/javascripts/private_token_viewer.js.es6
+++ b/app/assets/javascripts/private_token_viewer.js.es6
@@ -6,17 +6,12 @@
       this.$request = $('#private-token-request');
       this.$requestForm = this.$request.find('form');
 
-      this.initialSetup();
-    }
-
-    initialSetup() {
-      this.$show.addClass('hidden');
-      this.$error.addClass('hidden');
-
       this.$requestForm.on('submit', this.submitPassword.bind(this));
     }
 
-    submitPassword(event) {
+    submitPassword(e) {
+      e.preventDefault();
+
       $.ajax({
         url: this.$requestForm.attr('action'),
         method: 'POST',
@@ -32,6 +27,12 @@
         this.$error.addClass('hidden');
         this.$request.addClass('hidden');
       }).error((request) => {
+        var message = request.responseJSON && request.responseJSON.message;
+
+        if (!message) {
+          message = 'There was an error checking your password. Please try again.';
+        }
+
         this.$error.text(request.responseJSON.message);
 
         this.$show.addClass('hidden');
@@ -39,8 +40,6 @@
         this.$request.removeClass('hidden');
         this.$requestForm.find('[type="submit"]').enable();
       });
-
-      event.preventDefault();
     }
   };
 })(window.gl || (window.gl = {}));
diff --git a/app/assets/stylesheets/behaviors.scss b/app/assets/stylesheets/behaviors.scss
index f76396b0a02..897bc49e7df 100644
--- a/app/assets/stylesheets/behaviors.scss
+++ b/app/assets/stylesheets/behaviors.scss
@@ -21,10 +21,6 @@
   }
 }
 
-.hidden {
-  display: none;
-}
-
 // Hide element if Vue is still working on rendering it fully.
 [v-cloak="true"] {
   display: none !important;