From 6441a2a1f63e426547326e60d5aca9b94bd8a07f Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Sun, 26 Apr 2020 15:39:10 +0200
Subject: [PATCH] Fix Enter key behaviour in Wikidata login form. Closes #2565
 (#2566)

---
 .../module/scripts/dialogs/manage-account-dialog.html       | 6 +-----
 .../module/scripts/dialogs/manage-account-dialog.js         | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.html b/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.html
index b2eec7ca6..5ad8f9e23 100644
--- a/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.html
+++ b/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.html
@@ -26,7 +26,7 @@
                 </tr>
               </table>
               <div class="wikibase-login-buttons">
-                <button class="button cancel-button" bind="cancelButton1"></button>
+                <button class="button cancel-button" type="button" bind="cancelButton1"></button>
                 <input class="button button-primary" type="submit" bind="loginButton"></input>
               </div>
             </form>
@@ -34,10 +34,6 @@
           <div class="wikibase-user-logout" bind="logoutArea">
             <p><span bind="loggedInAs"></span>
                <a bind="loggedInUsername" target="_blank"></a></p>
-            <form bind="logoutForm" method="post">
-              <input type="hidden" name="wb-username" value="null" />
-              <input name="wb-password" type="hidden" value="null" />
-            </form>
             <div class="wikibase-login-buttons">
                 <button class="button cancel-button" bind="cancelButton2"></button>
                 <button class="button button-primary" bind="logoutButton"></button>
diff --git a/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js b/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js
index 0e7e71107..5717354d6 100644
--- a/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js
+++ b/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js
@@ -39,6 +39,7 @@ ManageAccountDialog.display = function(logged_in_username, saved_credentials, ca
   }
 
   this._level = DialogSystem.showDialog(frame);
+  this._elmts.usernameInput.focus();
 
   var dismiss = function() {
     DialogSystem.dismissUntil(self._level - 1);