Added new chili version. Added JSON formatting.

scott2449 · Aug 4, 2011 · 3d6a45b · 3d6a45b
1 parent 2e4ee2d
commit 3d6a45b
Show file tree

Hide file tree

Showing 11 changed files with 392 additions and 49 deletions.
diff --git a/resources/screen1.png b/resources/screen1.png
diff --git a/resources/screen2.png b/resources/screen2.png
diff --git a/resources/screen3.png b/resources/screen3.png
diff --git a/simple-rest-client/_locales/en/messages.json b/simple-rest-client/_locales/en/messages.json
@@ -12,7 +12,5 @@
   "response": {"message": "Response"},
   "processing": {"message": "Processing"},
   "status": {"message": "Status"},
-  "bad_request": {"message": "Bad request"},
-  "source": {"message": "<a href='http://github.com/jeremys/Simple-Rest-Client-Chrome-Extension'>Source code</a> licensed under the Apache License"},
-  "icon": {"message": "icon by <a href='http://jasonrayner.deviantart.com/art/Internet-Icon-icns-and-png-130014831'>Jason Rayner</a>"}
+  "bad_request": {"message": "Bad request"}
 }
diff --git a/simple-rest-client/_locales/fr/messages.json b/simple-rest-client/_locales/fr/messages.json
diff --git a/simple-rest-client/improved_style.css b/simple-rest-client/improved_style.css
@@ -397,4 +397,11 @@ li .right {
 
 * html .clearfix {
     zoom: 1;
+}
+
+
+#langFormat {
+    position: absolute;
+    margin-top: -20px;
+    margin-left: 100px;
 }
diff --git a/simple-rest-client/index.html b/simple-rest-client/index.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html>
-<head>
+<html><head>
     <meta charset="utf-8"/>
     <title>POSTMan for Google Chrome</title>
     <link rel="stylesheet" type="text/css" href="improved_style.css"/>
     <link rel="stylesheet" type="text/css" href="css/ui-lightness/jquery-ui-1.8.14.custom.css"/>
+    <link rel="stylesheet" type="text/css" href="css/ui-lightness/jquery-ui-1.8.14.custom.css"/>
     <script type="text/javascript" src="jquery.min.js"></script>
     <script type="text/javascript">
         //<![CDATA[
@@ -108,8 +108,6 @@ <h4>Edit Params</h4>
                 <div class="buttonLayout">
                     <a href="javascript:void(0);" class="editTextButton" onclick="showBodyParamsEditor()"
                        id="bodyParamsButton" style="margin-left:5px">Params</a>
-                    <a href="javascript:void(0);" class="editTextButton" onclick="showFileSelector()"
-                       id="bodyFileButton" style="margin-left:5px">File</a>
                     <a href="javascript:void(0);" class="editTextButton" onclick="showRawEditor()"
                        id="bodyRawButton" style="margin-left:5px">Raw body</a>
                 </div>
@@ -162,9 +160,16 @@ <h4>Edit Params</h4>
 
                 <div id="respData" style="display:none">
                     <label for="responseData" class="labelText">Data</label>
+                    <div id="langFormat">
+                        <label for="language" class="labelText">Select format</label>
+                        <select id="language">
+                            <option value="html">HTML/XML</option>
+                            <option value="javascript">JSON</option>
+                        </select>
+                    </div>
 
                     <div name="responseData" id="responseData" contenteditable="true">
-                        <pre><code name="codeData" id="codeData" class="chili-lang-html">&nbsp;</code></pre>
+                        <pre><code name="codeData" id="codeData" class="chili-lang-html" data-formatted="false">&nbsp;</code></pre>
                     </div>
                 </div>
             </div>

diff --git a/simple-rest-client/jquery.chili.min.js b/simple-rest-client/jquery.chili.min.js
diff --git a/simple-rest-client/jquery.chili.recipes.js b/simple-rest-client/jquery.chili.recipes.js
diff --git a/simple-rest-client/requester.js b/simple-rest-client/requester.js
@@ -211,6 +211,7 @@ function readResponse() {
             requestEndTime = new Date().getTime();
             var diff = requestEndTime - requestStartTime;
             $('#ptime span').html(diff + " ms");
+
             $.chili.options.automatic.active = true;
             $.chili.options.decoration.lineNumbers = false;
             var $chili = $('#codeData').chili();
@@ -279,6 +280,11 @@ function init() {
 
     //Initialize file input handler
 //    $("bodyFile").addEventListener("change", handleFileSelect, false);
+
+    $('#langFormat').change(function() {
+        var format = $('#language').val();
+        setResponseFormat(format);
+    })
 }
 
 function requestExists(requestItem) {
@@ -842,4 +848,22 @@ function addHeaderAutoComplete() {
         source: availableHeaders,
         delay: 50
     });
+}
+
+function setResponseFormat(format) {
+    $('#codeData').removeClass();
+    $('#codeData').addClass('chili-lang-' + format);
+
+    var val = $('#codeData').html();
+    var isFormatted = $('#codeData').attr('data-formatted');
+
+    if(format === 'javascript' && isFormatted === 'false') {
+        var jsonObject = JSON.parse(val);
+        var text = JSON.stringify(jsonObject, null, '\t');
+        $('#codeData').html(text);
+        $('#codeData').attr('data-formatted', 'true');
+    }
+
+    $.chili.options.automatic.active = true;
+    var $chili = $('#codeData').chili();
 }
diff --git a/simple-rest-client/style.css b/simple-rest-client/style.css
@@ -134,4 +134,4 @@ textarea {
 #urlParamsEditor,
 #bodyParamsEditor {
     display: none;
-}
+}