Merge branch 'master' into jquery-ui

blueimp · blueimp · commit a73dd4ed0714 · 2012-11-21T11:33:47.000+01:00
diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ The File Upload plugin is regularly tested with the latest browser versions and
 * Google Chrome
 * Apple Safari 4.0+
 * Mozilla Firefox 3.0+
-* Opera 10.0+
+* Opera 11.0+
 * Microsoft Internet Explorer 6.0+
 
 ### Mobile browsers
diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.19.3
+ * jQuery File Upload Plugin 5.19.4
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -10,7 +10,7 @@
  */
 
 /*jslint nomen: true, unparam: true, regexp: true */
-/*global define, window, document, Blob, FormData, location */
+/*global define, window, document, File, Blob, FormData, location */
 
 (function (factory) {
     'use strict';
@@ -209,10 +209,10 @@
             if (typeof options.formData === 'function') {
                 return options.formData(options.form);
             }
-			if ($.isArray(options.formData)) {
+            if ($.isArray(options.formData)) {
                 return options.formData;
             }
-			if (options.formData) {
+            if (options.formData) {
                 formData = [];
                 $.each(options.formData, function (name, value) {
                     formData.push({name: name, value: value});
@@ -345,10 +345,12 @@
                         formData.append(paramName, options.blob, file.name);
                     } else {
                         $.each(options.files, function (index, file) {
-                            // File objects are also Blob instances.
+                            // Files are also Blob instances, but some browsers
+                            // (Firefox 3.6) support the File API but not Blobs.
                             // This check allows the tests to run with
                             // dummy objects:
-                            if (file instanceof Blob) {
+                            if ((window.Blob && file instanceof Blob) ||
+                                    (window.File && file instanceof File)) {
                                 formData.append(
                                     options.paramName[index] || paramName,
                                     file,
@@ -758,7 +760,8 @@
                         that._onSend(e, this);
                     return this.jqXHR;
                 };
-                return (result = that._trigger('add', e, newData));
+                result = that._trigger('add', e, newData);
+                return result;
             });
             return result;
         },
diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php
@@ -53,7 +53,7 @@ function __construct($options = null, $initialize = true) {
                 'GET',
                 'POST',
                 'PUT',
-				'PATCH',
+                'PATCH',
                 'DELETE'
             ),
             'access_control_allow_headers' => array(
@@ -124,8 +124,8 @@ protected function initialize() {
             case 'GET':
                 $this->get();
                 break;
-			case 'PATCH':
-			case 'PUT':
+            case 'PATCH':
+            case 'PUT':
             case 'POST':
                 $this->post();
                 break;
@@ -461,16 +461,16 @@ protected function orient_image($file_path) {
         $image = @imagecreatefromjpeg($file_path);
         switch ($orientation) {
             case 3:
-            	$image = @imagerotate($image, 180, 0);
-            	break;
+                $image = @imagerotate($image, 180, 0);
+                break;
             case 6:
-            	$image = @imagerotate($image, 270, 0);
-            	break;
+                $image = @imagerotate($image, 270, 0);
+                break;
             case 8:
-            	$image = @imagerotate($image, 90, 0);
-            	break;
+                $image = @imagerotate($image, 90, 0);
+                break;
             default:
-            	return false;
+                return false;
         }
         $success = imagejpeg($image, $file_path);
         // Free up memory (imagedestroy does not delete files):
@@ -540,17 +540,17 @@ protected function handle_file_upload($uploaded_file, $name, $size, $type, $erro
         return $file;
     }
 
-	protected function readfile($file_path) {
-		return readfile($file_path);
-	}
+    protected function readfile($file_path) {
+        return readfile($file_path);
+    }
 
-	protected function body($str) {
-		echo $str;
-	}
-	
-	protected function header($str) {
-		header($str);
-	}
+    protected function body($str) {
+        echo $str;
+    }
+    
+    protected function header($str) {
+        header($str);
+    }
 
     protected function generate_response($content, $print_response = true) {
         if ($print_response) {
