Skip to content
This repository was archived by the owner on Jan 10, 2024. It is now read-only.

Commit c3edd29

Browse files
author
Pat Patterson
committed
Dependencies, fix proxying in Visualforce
1 parent 2349e0a commit c3edd29

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

bulk.page

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ Sample Visualforce page for Force.com Bulk API JavaScript Toolkit
9292
<script src="{!$Resource.forcetk}"></script>
9393
<script src="{!$Resource.jxon}"></script>
9494
<script src="{!$Resource.bulkTK}"></script>
95+
<!-- From https://github.com/vkiryukhin/vkBeautify -->
9596
<script src="{!$Resource.vkbeautify}"></script>
9697
<script>
9798
var client = new forcetk.Client();

bulktk.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
/*
2828
* BulkTK: JavaScript library to wrap Force.com Bulk API. Extends ForceTK.
2929
* Dependencies:
30-
* jquery - http://jquery.com/
31-
* ForceTK - https://github.com/developerforce/Force.com-JavaScript-REST-Toolkit
32-
* jxon - https://github.com/wireload/Ratatosk/blob/master/jxon.js
30+
* jquery - http://jquery.com/
31+
* ForceTK - https://github.com/developerforce/Force.com-JavaScript-REST-Toolkit/blob/master/forcetk.js
32+
* jxon - https://github.com/developerforce/Force.com-JavaScript-REST-Toolkit/blob/master/jxon.js
33+
* (originally from the [Ratatosk](https://github.com/wireload/Ratatosk)
34+
* project; this version preserves case in element and attribute names)
3335
*/
3436

3537
forcetk.Client.prototype.xmlHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
@@ -85,7 +87,7 @@ forcetk.Client.prototype.bulkAjax = function(path, parseXML, callback, error, me
8587
},
8688
dataType: "text",
8789
beforeSend: function(xhr) {
88-
if (that.proxyUrl !== null && ! that.visualforce) {
90+
if (that.proxyUrl !== null) {
8991
xhr.setRequestHeader('SalesforceProxy-Endpoint', url);
9092
}
9193
xhr.setRequestHeader('X-SFDC-Session', that.sessionId);

0 commit comments

Comments
 (0)