Use Exif - include all load-image features

cipacda · cipacda · commit 2dc1a7270f6e · 2014-02-23T15:43:06.000Z
diff --git a/lib/jquery/fileupload/rails/version.rb b/lib/jquery/fileupload/rails/version.rb
@@ -1,7 +1,7 @@
 module JQuery
   module FileUpload
     module Rails
-      VERSION = "0.4.2"
+      VERSION = "0.4.3"
     end
   end
 end
diff --git a/vendor/assets/javascripts/jquery-fileupload/index.js b/vendor/assets/javascripts/jquery-fileupload/index.js
@@ -1,5 +1,7 @@
 //= require jquery-fileupload/vendor/jquery.ui.widget
 //= require jquery-fileupload/vendor/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-process
diff --git a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js b/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js
@@ -259,7 +259,7 @@
                 }
                 var that = this,
                     dfd = $.Deferred();
-                loadImage(data.files[data.index], function (result) {
+                loadImage.parseMetaData(data.files[data.index], function (result) {
                     $.extend(data, result);
                     dfd.resolveWith(that, [data]);
                 }, options);
diff --git a/vendor/assets/javascripts/jquery-fileupload/vendor/load-image.js b/vendor/assets/javascripts/jquery-fileupload/vendor/load-image.js

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@`
`259`	`259`	`}`
`260`	`260`	`var that = this,`
`261`	`261`	`dfd = $.Deferred();`
`262`		`- loadImage(data.files[data.index], function (result) {`
	`262`	`+ loadImage.parseMetaData(data.files[data.index], function (result) {`
`263`	`263`	`$.extend(data, result);`
`264`	`264`	`dfd.resolveWith(that, [data]);`
`265`	`265`	`}, options);`