#382 - add a setDeleteFileEndpoint API function for this feature that mirrors the behavior of the existing setEndpoint API function

Author: Ray Nicholus

client/js/ajax.requester.js

@@ -11,6 +11,8 @@ qq.AjaxRequestor = function(o) {
             method: 'POST',
             maxConnections: 3,
             customHeaders: {},
+            endpointStore: {},
+            paramsStore: {},
             successfulResponseCodes: [200],
             demoMode: false,
             cors: {
@@ -68,8 +70,8 @@ qq.AjaxRequestor = function(o) {
 
         options.onSend(id);
 
-        if (requestState[id].paramsStore.getParams) {
-            params = requestState[id].paramsStore.getParams(id);
+        if (options.paramsStore.getParams) {
+            params = options.paramsStore.getParams(id);
         }
 
         url = createUrl(id, params);
@@ -94,8 +96,12 @@ qq.AjaxRequestor = function(o) {
     }
 
     function createUrl(id, params) {
-        var method = getMethod(),
-            endpoint = requestState[id].endpoint;
+        var endpoint = options.endpointStore.getEndpoint(id),
+            addToPath = requestState[id].addToPath;
+
+        if (addToPath !== undefined) {
+            endpoint += "/" + addToPath;
+        }
 
         if (shouldParamsBeInQueryString && params) {
             return qq.obj2url(params, endpoint);
@@ -159,10 +165,9 @@ qq.AjaxRequestor = function(o) {
 
 
     return {
-        send: function(id, endpoint, paramsStore) {
+        send: function(id, addToPath) {
             requestState[id] = {
-                paramsStore: paramsStore,
-                endpoint: endpoint
+                addToPath: addToPath
             };
 
             var len = queue.push(id);

client/js/deletefile.ajax.requester.js

@@ -5,7 +5,7 @@ qq.DeleteFileAjaxRequestor = function(o) {
 
     var requestor,
         options = {
-            endpoint: '/server/upload',
+            endpointStore: {},
             maxConnections: 3,
             customHeaders: {},
             paramsStore: {},
@@ -23,6 +23,8 @@ qq.DeleteFileAjaxRequestor = function(o) {
 
     requestor = new qq.AjaxRequestor({
         method: 'DELETE',
+        endpointStore: options.endpointStore,
+        paramsStore: options.paramsStore,
         maxConnections: options.maxConnections,
         customHeaders: options.customHeaders,
         successfulResponseCodes: [200, 202, 204],
@@ -32,16 +34,10 @@ qq.DeleteFileAjaxRequestor = function(o) {
         onComplete: options.onDeleteComplete
     });
 
-    function createEndpoint(uuid) {
-        return options.endpoint + "/" + uuid;
-    }
-
 
     return {
         sendDelete: function(id, uuid) {
-            var endpoint = createEndpoint(uuid);
-
-            requestor.send(id, endpoint, options.paramsStore);
+            requestor.send(id, uuid);
             options.log("Submitted delete file request for " + id);
         }
     };

client/js/uploader.basic.js

@@ -116,7 +116,8 @@ qq.FineUploaderBasic = function(o){
     this._paramsStore = this._createParamsStore("request");
     this._deleteFileParamsStore = this._createParamsStore("deleteFile");
 
-    this._endpointStore = this._createEndpointStore();
+    this._endpointStore = this._createEndpointStore("request");
+    this._deleteFileEndpointStore = this._createEndpointStore("deleteFile");
 
     this._handler = this._createUploadHandler();
     this._deleteHandler = this._createDeleteHandler();
@@ -245,6 +246,15 @@ qq.FineUploaderBasic.prototype = {
     deleteFile: function(fileId) {
         this._onSubmitDelete(fileId);
     },
+    setDeleteFileEndpoint: function(endpoint, fileId) {
+        /*jshint eqeqeq: true, eqnull: true*/
+        if (fileId == null) {
+            this._options.deleteFile.endpoint = endpoint;
+        }
+        else {
+            this._deleteFileEndpointStore.setEndpoint(endpoint, fileId);
+        }
+    },
     _createUploadButton: function(element){
         var self = this;
 
@@ -329,10 +339,10 @@ qq.FineUploaderBasic.prototype = {
         var self = this;
 
         return new qq.DeleteFileAjaxRequestor({
-            endpoint: this._options.deleteFile.endpoint,
             maxConnections: this._options.deleteFile.maxConnections,
             customHeaders: this._options.deleteFile.customHeaders,
             paramsStore: this._deleteFileParamsStore,
+            endpointStore: this._deleteFileEndpointStore,
             demoMode: this._options.demoMode,
             cors: this._options.cors,
             log: function(str, level) {
@@ -706,7 +716,7 @@ qq.FineUploaderBasic.prototype = {
             }
         };
     },
-    _createEndpointStore: function() {
+    _createEndpointStore: function(type) {
         var endpointStore = {},
         self = this;
 
@@ -721,7 +731,7 @@ qq.FineUploaderBasic.prototype = {
                     return endpointStore[fileId];
                 }
 
-                return self._options.request.endpoint;
+                return self._options[type].endpoint;
             },
 
             remove: function(fileId) {

readme.md

@@ -1208,6 +1208,7 @@ if the user agent does not support the File API.
 or if the user agent does not support the File API.  For more info on the `File` object, please see [the entry in the W3C spec](http://www.w3.org/TR/FileAPI/#dfn-file).
 * `deleteFile(fileId)` - This allows you to programmatically order Fine Uploader to send a DELETE request for a specific file.
 Fine Uploader actually uses the API call internally when a user clicks the delete link in FineUploader mode.
+* `setDeleteFileEndpoint(String endpointPath, [optional] Number fileId)` - Same as the `setEndpoint` function except this applies only to the `deleteFile` option endpoint(s).
 * `getUuid(fileId)` - Retrieves the UUID associated with a file, given a current session file ID.
 
 <br/>