From f65640882fb1daf99a83d531ebcf8f533a27f4bb Mon Sep 17 00:00:00 2001
From: hristoterezov <hristo@jitsi.org>
Date: Tue, 2 Sep 2014 11:03:53 +0300
Subject: [PATCH] Fixes welcome page input Enter button action.

---
 app.js     | 9 ++++++---
 index.html | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index 7fb9c34a6..9ac30148c 100644
--- a/app.js
+++ b/app.js
@@ -1034,18 +1034,21 @@ $(document).ready(function () {
         $("#videoconference_page").hide();
         $("#domain_name").text(window.location.host + "/");
         $("span[name='appName']").text(brand.appName);
-        $("#enter_room_button").click(function()
+        function enter_room()
         {
             var val = $("#enter_room_field").val();
             if(!val)
                 val = $("#enter_room_field").attr("room_name");
             window.location.pathname = "/" + val;
+        }
+        $("#enter_room_button").click(function()
+        {
+            enter_room();
         });
 
         $("#enter_room_field").keydown(function (event) {
             if (event.keyCode === 13) {
-                var val = Util.escapeHtml(this.value);
-                window.location.pathname = "/" + val;
+                enter_room();
             }
         });
 
diff --git a/index.html b/index.html
index 4f15c46f3..982b9d3d3 100644
--- a/index.html
+++ b/index.html
@@ -78,7 +78,7 @@
                     <div id="enter_room_form" >
                         <div id="domain_name"></div>
                         <div id="enter_room">
-                            <input id="enter_room_field" type="text" placeholder="Enter room name" />
+                            <input id="enter_room_field" type="text" autofocus placeholder="Enter room name" />
                             <div class="icon-reload" id="reload_roomname"></div>
                             <input id="enter_room_button" type="button" value="GO" />