Skip to content

Commit

Permalink
Merge branch 'master' of github-sfdc:developerforce/Force.com-JavaScr…
Browse files Browse the repository at this point in the history
…ipt-REST-Toolkit
  • Loading branch information
Pat Patterson committed Sep 29, 2011
2 parents bbcc49e + 4ee9b45 commit f388155
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions forcetk.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ if (forcetk.Client === undefined) {
this.sessionId = null;
this.apiVersion = null;
this.instanceUrl = null;
this.asyncAjax = true;
}

/**
Expand All @@ -98,6 +99,7 @@ if (forcetk.Client === undefined) {
$j.ajax({
type: 'POST',
url: (this.proxyUrl !== null) ? this.proxyUrl: url,
cache: false,
processData: false,
data: 'grant_type=refresh_token&client_id=' + this.clientId + '&refresh_token=' + this.refreshToken,
success: callback,
Expand Down Expand Up @@ -149,8 +151,10 @@ if (forcetk.Client === undefined) {

$j.ajax({
type: method || "GET",
async: this.asyncAjax,
url: (this.proxyUrl !== null) ? this.proxyUrl: url,
contentType: 'application/json',
cache: false,
processData: false,
data: payload,
success: callback,
Expand Down

0 comments on commit f388155

Please sign in to comment.