From acba3e59ae2f85dc9b5c4761766e190b1e3bced7 Mon Sep 17 00:00:00 2001
From: Bhanu Gupta <bhanu.tech.contact@gmail.com>
Date: Sun, 22 Dec 2019 19:56:39 +0530
Subject: [PATCH] Enter key press issues resolved

---
 .../scripts/dialogs/manage-account-dialog.js  | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js b/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js
index 76087c6b5..a61391d5a 100644
--- a/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js
+++ b/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js
@@ -17,6 +17,7 @@ ManageAccountDialog.display = function(logged_in_username, saved_credentials, ca
   var self = this;
   var frame = $(DOM.loadHTML("wikidata", "scripts/dialogs/manage-account-dialog.html"));
   var elmts = this._elmts = DOM.bind(frame);
+  var isOpen = true;
   ManageAccountDialog.firstLaunch = false;
 
   this._elmts.dialogHeader.text($.i18n('wikidata-account/dialog-header'));
@@ -37,6 +38,7 @@ ManageAccountDialog.display = function(logged_in_username, saved_credentials, ca
 
   var dismiss = function() {
     DialogSystem.dismissUntil(self._level - 1);
+    isOpen = false;
   };
 
   if (logged_in_username != null) {
@@ -54,40 +56,39 @@ ManageAccountDialog.display = function(logged_in_username, saved_credentials, ca
      callback(null);
   });
 
+  var Login = (function() {
+    return function() {
+      frame.hide();
+      Refine.postCSRF(
+        "command/wikidata/login",
+        elmts.loginForm.serialize(),
+        function(data) {
+          if (data.logged_in) {
+            dismiss();
+            callback(data.username);
+          }
+          else {
+              frame.show();
+              isOpen = true;
+              elmts.invalidCredentials.text("Invalid credentials.");
+          }
+      });
+    };
+  })();
+
+
   elmts.loginButton.click(function() {
-    frame.hide();
-    Refine.postCSRF(
-       "command/wikidata/login",
-       elmts.loginForm.serialize(),
-       function(data) {
-         if (data.logged_in) {
-           dismiss();
-           callback(data.username);
-         } else {
-            frame.show();
-            elmts.invalidCredentials.text("Invalid credentials.");
-         }
-       });
+    Login();
   });
 
-
  	document.addEventListener('keydown', function(event) {
-        if (event.keyCode == 13) {
-            frame.hide();
-            Refine.postCSRF(
-               "command/wikidata/login",
-               elmts.loginForm.serialize(),
-               function(data) {
-                 if (data.logged_in) {
-                   dismiss();
-                   callback(data.username);
-                 } else {
-                    frame.show();
-                    elmts.invalidCredentials.text("Invalid credentials.");
-                 }
-               });
+        if(isOpen == true){
+          if (event.keyCode == 13) {
+            isOpen = false;
+            Login();
           }
-    });
+        }
+  });
 
   elmts.logoutButton.click(function() {
     Refine.postCSRF(