Added _output to JSAPI params, moved JS nice_fingerprint to better spot

mailpile · Oct 24, 2014 · 66958a6 · 66958a6
1 parent cf55fb6
commit 66958a6
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 18 deletions.
diff --git a/static/default/html/jsapi/index.js b/static/default/html/jsapi/index.js
@@ -133,28 +133,43 @@ Mailpile.API._ajax_error =  function(base_url, command, data, method, response,
 
 Mailpile.API._action = function(base_url, command, data, method, callback) {
 
-  if (method != "GET" && method != "POST") {
-    method = "GET";
+  // Output format
+  var output = '';
+  if (data._output) {
+    output = data._output;
+    data = _.omit(data, '_output');
   }
-  if (method == "GET") {
-    for(var k in data) {
-      if(!data[k] || data[k] == undefined) {
+
+  // Default to GET
+  if (method !== 'GET' && method !== 'POST') {
+    method = 'GET';
+  }
+
+  // GET
+  if (method === 'GET') {
+    for (var k in data) {
+      if (!data[k] || data[k] == undefined) {
         delete data[k];
       }
     }
+
+    // Make Querystring
     var params = $.param(data);
+
     $.ajax({
-      url      : base_url + command + "?" + params,
+      url      : base_url + command + output + "?" + params,
       type     : 'GET',
       dataType : 'json',
       success  : callback,
       error: function(response, status) {
         Mailpile.API._ajax_error(base_url, command, data, method, response, status);
       }
     });
-  } else if (method =="POST") {
+  }
+  // POST
+  else if (method === 'POST') {
     $.ajax({
-      url      : base_url + command,
+      url      : base_url + command + output,
       type     : 'POST',
       data     : data,
       dataType : 'json',
@@ -163,8 +178,6 @@ Mailpile.API._action = function(base_url, command, data, method, callback) {
         Mailpile.API._ajax_error(base_url, command, data, method, response, status);
       }
     });
-  } else {
-    alert('Somethings rotten in Denmark');
   }
 
   return true;
@@ -199,8 +212,10 @@ Mailpile.API._async_action = function(command, data, method, callback, flags) {
 };
 
 
-/* Create sync & asyn API commands */
+/* Loop Commands */
 {% for command in result.api_methods -%}
+
+/* Create sync API commands */
 Mailpile.API.{{command.url|replace("/", "_")}}_{{command.method|lower}} = function(data, callback, method) {
   var methods = ["{{command.method}}"];
   if (!method || methods.indexOf(method) == -1) {
@@ -214,6 +229,7 @@ Mailpile.API.{{command.url|replace("/", "_")}}_{{command.method|lower}} = functi
   );
 };
 
+/* Create async API commands */
 Mailpile.API.async_{{command.url|replace("/", "_")}}_{{command.method|lower}} = function(data, callback, method) {
   var methods = ["{{command.method}}"];
   if (!method || methods.indexOf(method) == -1) {
@@ -242,10 +258,3 @@ Mailpile.API.async_{{command.url|replace("/", "_")}}_{{command.method|lower}} =
 {% endif %}
 {% endfor %}
 
-
-/* Mailpile - UI - Make fingerprints nicer */
-Mailpile.nice_fingerprint = function(fingerprint) {
-  // FIXME: I'd really love to make these individual pieces color coded
-  // Pertaining to the hex value pairings & even perhaps toggle-able icons
-  return fingerprint.split(/(....)/).join(' ');
-};
diff --git a/static/default/html/jsapi/ui/global.js b/static/default/html/jsapi/ui/global.js
@@ -49,4 +49,12 @@ Mailpile.render = function() {
       Mousetrap.bind(keybinding[1], keybinding[2]);
 		}
 	}
+};
+
+
+/* Mailpile - UI - Make fingerprints nicer */
+Mailpile.nice_fingerprint = function(fingerprint) {
+  // FIXME: I'd really love to make these individual pieces color coded
+  // Pertaining to the hex value pairings & even perhaps toggle-able icons
+  return fingerprint.split(/(....)/).join(' ');
 };