Skip to content

John McEleney / casperjs

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 8641c3de 8641c3dee833cda80b15cf52859e1e5bed280ed2 by Jason Funk
Options

Fix indentation and coding standard issues

1 parent 3f46bea9
Inline Side-by-side
Showing 2 changed files with 31 additions and 36 deletions
......@@ -121,9 +121,9 @@
* NOTE: we cannot use window.btoa() for some strange reasons here.
*
* @param String url The url to download
* @param String method The method to use, optional: default GET
* @param String data The data to send, optional
* @return string Base64 encoded result
* @param String method The method to use, optional: default GET
* @param String data The data to send, optional
* @return string Base64 encoded result
*/
base64encode: function(url,method,data) {
return this.evaluate(function(url,method,data) {
......
......@@ -224,12 +224,12 @@
* contents.
*
* @param String url The resource url
* @param String method The request method, optional
* @param Object data The request data, optional
* @param String method The request method, optional
* @param Object data The request data, optional
* @return String Base64 contents string
*/
this.getBase64 = function(url,method,data) {
return this.encode(this.getBinary(url,method,data));
return this.encode(this.getBinary(url,method,data));
};
/**
......@@ -237,43 +237,38 @@
* fails but log errors.
*
* @param String url
* @param String method
* @param Object data
* @param String method
* @param Object data
* @return string
*/
this.getBinary = function(url, method, data) {
try {
var xhr = new XMLHttpRequest();
if(method === undefined || ["GET","get","POST","post"].indexOf(method) == -1)
{
method = "GET";
}else{
method = method.toUpperCase();
}
if (method === undefined || ["GET","get","POST","post"].indexOf(method) == -1) {
method = "GET";
} else {
method = method.toUpperCase();
}
xhr.open(method, url, false);
this.log("Using HTTP method: '" + method + "'", "debug");
xhr.open(method, url, false);
this.log("using HTTP method: '" + method + "'", "debug");
xhr.overrideMimeType("text/plain; charset=x-user-defined");
if(method == "POST")
{
if(data === undefined)
{
data_str = "";
}else{
data_str = "";
for(k in data)
{
if(typeof(k) == "string" && typeof(data[k]) == "string")
{
data_str += "&" + escape(k) + "=" + escape(data[k]);
}
}
data_str = data_str.substring(1);
}
xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
}
this.log("Using request data: '" + data_str + "'", "debug");
xhr.send(method == "POST" ? data_str : null);
if (method == "POST") {
if(data === undefined) {
data_str = "";
} else {
data_str = "";
for (k in data) {
if (typeof(k) == "string" && typeof(data[k]) == "string") {
data_str += "&" + escape(k) + "=" + escape(data[k]);
}
}
data_str = data_str.substring(1);
}
xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
}
this.log("using request data: '" + data_str + "'", "debug");
xhr.send(method == "POST" ? data_str : null);
return xhr.responseText;
} catch (e) {
if (e.name === "NETWORK_ERR" && e.code === 101) {
......