From 51c4388f07bb3cdc3053c8751f7d1d8a85c42e02 Mon Sep 17 00:00:00 2001 From: Ron Hess Date: Tue, 6 Mar 2012 14:39:00 -0800 Subject: [PATCH 1/2] getChatterFile should use the proxyUrl if it is set, required by Visualforce apps --- forcetk.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/forcetk.js b/forcetk.js index 116ebde..720e587 100644 --- a/forcetk.js +++ b/forcetk.js @@ -199,13 +199,16 @@ if (forcetk.Client === undefined) { var url = this.instanceUrl + path; var request = new XMLHttpRequest(); - - - request.open("GET", url, true); + + + request.open("GET", (this.proxyUrl !== null) ? this.proxyUrl: url, true); request.responseType = "arraybuffer"; request.setRequestHeader(that.authzHeader, "OAuth " + that.sessionId); request.setRequestHeader('X-User-Agent', 'salesforce-toolkit-rest-javascript/' + that.apiVersion); + if (that.proxyUrl !== null) { + request.setRequestHeader('SalesforceProxy-Endpoint', url); + } request.onreadystatechange = function() { // continue if the process is completed From c212a32cd35aa2a6dfcba5e1e861a70e107ac917 Mon Sep 17 00:00:00 2001 From: Ron Hess Date: Tue, 6 Mar 2012 15:20:29 -0800 Subject: [PATCH 2/2] minor change from that to this --- forcetk.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/forcetk.js b/forcetk.js index 720e587..f754db9 100644 --- a/forcetk.js +++ b/forcetk.js @@ -195,18 +195,16 @@ if (forcetk.Client === undefined) { **/ forcetk.Client.prototype.getChatterFile = function(path,mimeType,callback,error,retry) { var that = this; - var url = this.instanceUrl + path; var request = new XMLHttpRequest(); - - + request.open("GET", (this.proxyUrl !== null) ? this.proxyUrl: url, true); request.responseType = "arraybuffer"; request.setRequestHeader(that.authzHeader, "OAuth " + that.sessionId); request.setRequestHeader('X-User-Agent', 'salesforce-toolkit-rest-javascript/' + that.apiVersion); - if (that.proxyUrl !== null) { + if (this.proxyUrl !== null) { request.setRequestHeader('SalesforceProxy-Endpoint', url); }