From 7c5a7f56ce377691ee6eec797a351121bb3db165 Mon Sep 17 00:00:00 2001
From: Hao Liu <mouse.mliu@gmail.com>
Date: Mon, 30 Mar 2015 01:06:08 +0800
Subject: [PATCH] add enter key process for rest

---
 controller/login.js |  3 ---
 controller/rest.js  |  2 ++
 views/rest.html     | 24 +++++++++++++++++++-----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/controller/login.js b/controller/login.js
index 5cfb34c..8b8f195 100644
--- a/controller/login.js
+++ b/controller/login.js
@@ -4,9 +4,6 @@ var jsforce = require("jsforce")
     , util = require("./util");
 
 exports.login = function(req, res, next) {
-    console.log(req.hostname);
-    console.log(req.hostname === "localhost");
-    console.log(req.hostname == "localhost");
     oauth2 = req.hostname === "localhost" ? config.test : config.heroku;
     oauth2.loginUrl = req.body.login_url;
     req.session.oauth2 = oauth2;
diff --git a/controller/rest.js b/controller/rest.js
index d191ae1..b25a650 100644
--- a/controller/rest.js
+++ b/controller/rest.js
@@ -23,6 +23,8 @@ exports.executeRest = function(req, res, next) {
         }
     }
 
+    console.log(_request);
+
     var conn = new jsforce.Connection({
         accessToken: req.session.accessToken,
         instanceUrl: req.session.instanceUrl
diff --git a/views/rest.html b/views/rest.html
index 2fb431e..78ca1d9 100644
--- a/views/rest.html
+++ b/views/rest.html
@@ -8,7 +8,7 @@ <h2>Execute Rest</h2>
     <% if (notLogin) { %>
         <% include ./template/notLogin.html %>
     <%} else { %>
-        <form name="form" method="post" action="/rest">
+        <form name="form">
             <div class="form-group col-sm-12">
                 <div class="panel panel-default">
                     <div class="panel-heading">
@@ -44,13 +44,13 @@ <h3 class="panel-title">Place HTTP method, REST URI and Body here: </h3>
 
                         <div class="row">
                             <div class="col-sm-8" style="margin-top: 5px;">
-                                <textarea class="form-control" rows="1" cols="25" id="rest_uri" name="rest_uri" 
-                                    required="true"><%- rest_uri %></textarea>
+                                <input type="text" class="form-control" id="rest_uri" name="rest_uri" 
+                                    required="true" value="<%- rest_uri %>"></textarea>
                             </div>
 
                             <div class="col-sm-4">
                                 <div class="btn-group" style="margin-top: 5px;">
-                                    <button type="button" id="executeRest" class="btn btn-primary connect">
+                                    <button type="button" id="executeRest" tabindex="0" class="btn btn-primary connect">
                                         <span class="glyphicon glyphicon-ok"></span> Execute
                                     </button>
                                 </div>
@@ -148,6 +148,15 @@ <h3 class="panel-title">Execution Result:</h3>
             }
         })
 
+        $("#rest_uri").keydown(function(e) {
+            if (e.keyCode == 13) {
+                executeRest();
+                return false;
+            }
+
+            return true;
+        })
+
         $("#executeRest").on("click", function() {
             if ($("#rest_body").is(":visible") && !$("#rest_body").val()) {
                 $("#rest_body_div").addClass("has-error");
@@ -156,6 +165,11 @@ <h3 class="panel-title">Execution Result:</h3>
             else {
                 $("#rest_body_div").removeClass("has-error");
             }
+
+            executeRest();
+        })
+
+        function executeRest() {
             rest_method = $(".radioBtn.active").children().val();
             rest_url = $("#rest_uri").val();
             rest_body = $("#rest_body").val();
@@ -177,7 +191,7 @@ <h3 class="panel-title">Execution Result:</h3>
                 $("#RawJson").val(JSON.stringify(resp, null, "  "));
                 process();
             });
-        });
+        }
     });
 </script>