Merge branch 'master' of github-sfdc:developerforce/Force.com-JavaScript-REST-Toolkit

Author: Pat Patterson

forcetk.js

@@ -249,8 +249,10 @@ if (forcetk.Client === undefined) {
      * @param [error=null] function to which jqXHR will be passed in case of error
      * @param [method="GET"] HTTP method for call
      * @param [payload=null] payload for POST/PATCH etc
+	 * @param [paramMap={}] parameters to send as header values for POST/PATCH etc
+	 * @param [retry] specifies whether to retry on error
      */
-    forcetk.Client.prototype.apexrest = function(path, callback, error, method, payload, retry) {
+    forcetk.Client.prototype.apexrest = function(path, callback, error, method, payload, paramMap, retry) {
         var that = this;
         var url = this.instanceUrl + '/services/apexrest' + path;
 
@@ -268,7 +270,7 @@ if (forcetk.Client === undefined) {
                     that.refreshAccessToken(function(oauthResponse) {
                         that.setSessionToken(oauthResponse.access_token, null,
                         oauthResponse.instance_url);
-                        that.ajax(path, callback, error, method, payload, true);
+                        that.apexrest(path, callback, error, method, payload, paramMap, true);
                     },
                     error);
                 } else {
@@ -280,6 +282,13 @@ if (forcetk.Client === undefined) {
                 if (that.proxyUrl !== null) {
                     xhr.setRequestHeader('SalesforceProxy-Endpoint', url);
                 }
+				//Add any custom headers
+				if (paramMap === null) {
+					paramMap = {};
+				}
+				for (paramName in paramMap) {
+					xhr.setRequestHeader(paramName, paramMap[paramName]);
+				}
                 xhr.setRequestHeader(that.authzHeader, "OAuth " + that.sessionId);
                 xhr.setRequestHeader('X-User-Agent', 'salesforce-toolkit-rest-javascript/' + that.apiVersion);
             }
@@ -430,6 +439,30 @@ if (forcetk.Client === undefined) {
         this.ajax('/' + this.apiVersion + '/query?q=' + escape(soql)
         , callback, error);
     }
+    
+    /*
+     * Queries the next set of records based on pagination.
+     * <p>This should be used if performing a query that retrieves more than can be returned
+     * in accordance with http://www.salesforce.com/us/developer/docs/api_rest/Content/dome_query.htm</p>
+     * <p>Ex: forcetkClient.queryMore( successResponse.nextRecordsUrl, successHandler, failureHandler )</p>
+     * 
+     * @param url - the url retrieved from nextRecordsUrl or prevRecordsUrl
+     * @param callback function to which response will be passed
+     * @param [error=null] function to which jqXHR will be passed in case of error
+     */
+    forcetk.Client.prototype.queryMore = function( url, callback, error ){
+        //-- ajax call adds on services/data to the url call, so only send the url after
+        var serviceData = "services/data";
+        var index = url.indexOf( serviceData );
+        
+        if( index > -1 ){
+        	url = url.substr( index + serviceData.length );
+        } else {
+        	//-- leave alone
+        }
+        
+        this.ajax( url, callback, error );
+    }
 
     /*
      * Executes the specified SOSL search.