Refactored @-options handling to save bytes.

If an option is set to @, the global option of the same name as the key
will be used, e.g.:
acceptFileTypes: '@', // acceptFileTypes

If the options set contains a property prefix, the global options key
will be the prefix plus the option key, concatenated in camel-case
spelling, e.g.:
prefix: 'loadImage',
acceptFileTypes: '@', // loadImageAcceptFileTypes

If the prefix is set to true, the action of the options set will be
used as key.

Author: blueimp

js/jquery.fileupload-image.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Image Preview & Resize Plugin 1.1
+ * jQuery File Upload Image Preview & Resize Plugin 1.2
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -35,31 +35,35 @@
     // Prepend to the default processQueue:
     $.blueimp.fileupload.prototype.options.processQueue.unshift(
         {
-            action: 'loadImage',
+            action: 'loadImageMetaData',
             // Always trigger this action,
             // even if the previous action was rejected: 
             always: true,
-            fileTypes: '@loadImageFileTypes',
-            maxFileSize: '@loadImageMaxFileSize',
-            noRevoke: '@loadImageNoRevoke',
-            disabled: '@disableImageLoad'
+            disableImageHead: '@',
+            disableExif: '@',
+            disableExifThumbnail: '@',
+            disableExifSub: '@',
+            disableExifGps: '@',
+            disabled: '@disableImageMetaDataLoad'
         },
         {
-            action: 'loadImageMetaData',
-            disabled: '@disableImageMetaDataLoad',
-            disableImageHead: '@disableImageHead',
-            disableExif: '@disableExif',
-            disableExifThumbnail: '@disableExifThumbnail',
-            disableExifSub: '@disableExifSub',
-            disableExifGps: '@disableExifGps'
+            action: 'loadImage',
+            // Use the action as prefix for the "@" options:
+            prefix: true,
+            fileTypes: '@',
+            maxFileSize: '@',
+            noRevoke: '@',
+            disabled: '@disableImageLoad'
         },
         {
             action: 'resizeImage',
-            maxWidth: '@imageMaxWidth',
-            maxHeight: '@imageMaxHeight',
-            minWidth: '@imageMinWidth',
-            minHeight: '@imageMinHeight',
-            crop: '@imageCrop',
+            // Use "image" as prefix for the "@" options:
+            prefix: 'image',
+            maxWidth: '@',
+            maxHeight: '@',
+            minWidth: '@',
+            minHeight: '@',
+            crop: '@',
             disabled: '@disableImageResize'
         },
         {
@@ -72,14 +76,19 @@
         },
         {
             action: 'resizeImage',
-            maxWidth: '@previewMaxWidth',
-            maxHeight: '@previewMaxHeight',
-            minWidth: '@previewMinWidth',
-            minHeight: '@previewMinHeight',
-            crop: '@previewCrop',
-            orientation: '@previewOrientation',
-            thumbnail: '@previewThumbnail',
-            canvas: '@previewAsCanvas',
+            // Always trigger this action,
+            // even if the previous action was rejected: 
+            always: true,
+            // Use "preview" as prefix for the "@" options:
+            prefix: 'preview',
+            maxWidth: '@',
+            maxHeight: '@',
+            minWidth: '@',
+            minHeight: '@',
+            crop: '@',
+            orientation: '@',
+            thumbnail: '@',
+            canvas: '@',
             disabled: '@disableImagePreview'
         },
         {
@@ -98,7 +107,7 @@
             // matched against the file type:
             loadImageFileTypes: /^image\/(gif|jpeg|png)$/,
             // The maximum file size of images to load:
-            loadImageMaxFileSize: 5000000, // 5MB
+            loadImageMaxFileSize: 10000000, // 10MB
             // The maximum width of resized images:
             imageMaxWidth: 1920,
             // The maximum height of resized images:
@@ -119,7 +128,7 @@
             // Define if preview images should be cropped or only scaled:
             previewCrop: false,
             // Define if preview images should be resized as canvas elements:
-            previewAsCanvas: true
+            previewCanvas: true
         },
 
         processActions: {

js/jquery.fileupload-process.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Processing Plugin 1.1
+ * jQuery File Upload Processing Plugin 1.2
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2012, Sebastian Tschan
@@ -98,11 +98,16 @@
         _transformProcessQueue: function (options) {
             var processQueue = [];
             $.each(options.processQueue, function () {
-                var settings = {};
+                var settings = {},
+                    action = this.action,
+                    prefix = this.prefix === true ? action : this.prefix;
                 $.each(this, function (key, value) {
                     if ($.type(value) === 'string' &&
                             value.charAt(0) === '@') {
-                        settings[key] = options[value.slice(1)];
+                        settings[key] = options[
+                            value.slice(1) || prefix ? prefix +
+                                key.charAt(0).toUpperCase() + key.slice(1) : key
+                        ];
                     } else {
                         settings[key] = value;
                     }

js/jquery.fileupload-validate.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Validation Plugin 1.0.2
+ * jQuery File Upload Validation Plugin 1.1
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -37,10 +37,10 @@
             // even if the previous action was rejected: 
             always: true,
             // Options taken from the global options map:
-            acceptFileTypes: '@acceptFileTypes',
-            maxFileSize: '@maxFileSize',
-            minFileSize: '@minFileSize',
-            maxNumberOfFiles: '@maxNumberOfFiles',
+            acceptFileTypes: '@',
+            maxFileSize: '@',
+            minFileSize: '@',
+            maxNumberOfFiles: '@',
             disabled: '@disableValidation'
         }
     );