Update all libraries. Add full version of load-image

Author: demiazz

app/assets/javascripts/jquery-fileupload/index.js

@@ -1,9 +1,7 @@
 //=require jquery-fileupload/vendor/jquery.ui.widget
-//=require jquery-fileupload/vendor/load-image
+//=require jquery-fileupload/vendor/load-image/load-image
 //=require jquery-fileupload/vendor/canvas-to-blob
 //=require jquery-fileupload/vendor/tmpl
 //=require jquery-fileupload/jquery.iframe-transport
 //=require jquery-fileupload/jquery.fileupload
-//=require jquery-fileupload/jquery.fileupload-fp
 //=require jquery-fileupload/jquery.fileupload-ui
-//=require jquery-fileupload/locale

app/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload AngularJS Plugin 1.4.4
+ * jQuery File Upload AngularJS Plugin 1.4.5
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -363,13 +363,15 @@
 
         .directive('fileUpload', function () {
             return {
-                controller: 'FileUploadController'
+                controller: 'FileUploadController',
+                scope: true
             };
         })
 
         .directive('fileUploadProgress', function () {
             return {
-                controller: 'FileUploadProgressController'
+                controller: 'FileUploadProgressController',
+                scope: true
             };
         })
 

app/assets/javascripts/jquery-fileupload/jquery.fileupload-fp.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Image Preview & Resize Plugin 1.2.3
+ * jQuery File Upload Image Preview & Resize Plugin 1.3.0
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -64,6 +64,7 @@
             minWidth: '@',
             minHeight: '@',
             crop: '@',
+            orientation: '@',
             disabled: '@disableImageResize'
         },
         {
@@ -109,6 +110,9 @@
             imageMaxWidth: 1920,
             // The maximum height of resized images:
             imageMaxHeight: 1080,
+            // Defines the image orientation (1-8) or takes the orientation
+            // value from Exif data if set to true:
+            imageOrientation: false,
             // Define if resized images should be cropped or only scaled:
             imageCrop: false,
             // Disable the resize image functionality by default:
@@ -131,7 +135,7 @@
         processActions: {
 
             // Loads the image given via data.files and data.index
-            // as img element if the browser supports canvas.
+            // as img element, if the browser supports the File API.
             // Accepts the options fileTypes (regular expression)
             // and maxFileSize (integer) to limit the files to load:
             loadImage: function (data, options) {
@@ -162,22 +166,26 @@
 
             // Resizes the image given as data.canvas or data.img
             // and updates data.canvas or data.img with the resized image.
+            // Also stores the resized image as preview property.
             // Accepts the options maxWidth, maxHeight, minWidth,
             // minHeight, canvas and crop:
             resizeImage: function (data, options) {
                 if (options.disabled) {
                     return data;
                 }
+                options = $.extend({canvas: true}, options);
                 var that = this,
                     dfd = $.Deferred(),
+                    img = (options.canvas && data.canvas) || data.img,
                     resolve = function (newImg) {
-                        data[newImg.getContext ? 'canvas' : 'img'] = newImg;
+                        if (newImg && (newImg.width !== img.width ||
+                                newImg.height !== img.height)) {
+                            data[newImg.getContext ? 'canvas' : 'img'] = newImg;
+                        }
+                        data.preview = newImg;
                         dfd.resolveWith(that, [data]);
                     },
-                    thumbnail,
-                    img,
-                    newImg;
-                options = $.extend({canvas: true}, options);
+                    thumbnail;
                 if (data.exif) {
                     if (options.orientation === true) {
                         options.orientation = data.exif.get('Orientation');
@@ -190,14 +198,9 @@
                         }
                     }
                 }
-                img = (options.canvas && data.canvas) || data.img;
                 if (img) {
-                    newImg = loadImage.scale(img, options);
-                    if (newImg.width !== img.width ||
-                            newImg.height !== img.height) {
-                        resolve(newImg);
-                        return dfd.promise();
-                    }
+                    resolve(loadImage.scale(img, options));
+                    return dfd.promise();
                 }
                 return data;
             },
@@ -278,9 +281,8 @@
             // Sets the resized version of the image as a property of the
             // file object, must be called after "saveImage":
             setImage: function (data, options) {
-                var img = data.canvas || data.img;
-                if (img && !options.disabled) {
-                    data.files[data.index][options.name || 'preview'] = img;
+                if (data.preview && !options.disabled) {
+                    data.files[data.index][options.name || 'preview'] = data.preview;
                 }
                 return data;
             }