Commit 1bcda2db authored by Jake Oliversen's avatar Jake Oliversen

Fixing merge changes

parent 9d30bf3a
......@@ -703,11 +703,7 @@ SC.import = function(path, data, options, callback){
//debug("Import form: ", form);
const postUrl = this.buildUri(path);
request.post({
<<<<<<< HEAD
url: postUrl,
=======
url: this.buildUri(path),
>>>>>>> 8c1676586858c555754f7327c3498d5365235d8f
formData: form, // Multi-part mode not necessary, but more efficient for large files than urlencoded
timeout: this.timeout,
followRedirect: false,
......@@ -748,8 +744,6 @@ SC.post = function(path,params,cb){
if(!this.isValidPath(path)){
cb("invalid path provided");
return;
<<<<<<< HEAD
=======
}
if(!cb || typeof(cb) !== "function"){
......@@ -758,13 +752,11 @@ SC.post = function(path,params,cb){
err ? reject(new Error(err)) : resolve(data)
});
})
>>>>>>> 8c1676586858c555754f7327c3498d5365235d8f
}
var sc_self=this;
params=params||{};
params._charset_ = params._charset_ || "utf-8";
<<<<<<< HEAD
const postUrl = this.buildUri(path);
var settings={
url: postUrl,
......@@ -775,7 +767,6 @@ SC.post = function(path,params,cb){
agent: sc_self.getRequestAgent(postUrl),
gzip: true
};
=======
var settings={
url: this.buildUri(path),
......@@ -784,7 +775,6 @@ SC.post = function(path,params,cb){
auth: this.makeAuth(),
headers: this.authCookieHeader()
};
>>>>>>> 8c1676586858c555754f7327c3498d5365235d8f
if(params.__url_encode){
delete params.__url_encode; settings.form=params;}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment