remove deprecated options: uploadScript and formData

linkesch · Jun 9, 2015 · 8020850 · 8020850
1 parent 628ec61
commit 8020850
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/src/js/images.js b/src/js/images.js
@@ -9,13 +9,11 @@
         addonName = 'Images', // first char is uppercase
         defaults = {
             label: '<span class="fa fa-camera"></span>',
-            uploadScript: null, // DEPRECATED: Use fileUploadOptions instead
             deleteScript: 'delete.php',
             preview: true,
             captions: true,
             captionPlaceholder: 'Type caption for image (optional)',
             autoGrid: 3,
-            formData: null, // DEPRECATED: Use fileUploadOptions instead
             fileUploadOptions: { // See https://github.com/blueimp/jQuery-File-Upload/wiki/Options
                 url: 'upload.php',
                 acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
@@ -201,16 +199,6 @@
                 }
             };
 
-        // Backwards compatibility
-        if (this.options.uploadScript) {
-            fileUploadOptions.url = this.options.uploadScript;
-            Util.deprecated('uploadScript', 'fileUploadOptions', '2.0');
-        }
-        if (this.options.formData) {
-            fileUploadOptions.formData = this.options.formData;
-            Util.deprecated('formData', 'fileUploadOptions', '2.0');
-        }
-
         // Only add progress callbacks for browsers that support XHR2,
         // and test for XHR2 per:
         // http://stackoverflow.com/questions/6767887/