Disable image resizing on the Basic Plus and AngularJS demo for Android and Opera.

blueimp · blueimp · commit a470fdcff40f · 2013-06-12T06:03:59.000-05:00
diff --git a/basic-plus.html b/basic-plus.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * jQuery File Upload Plugin Basic Plus Demo 1.1.1
+ * jQuery File Upload Plugin Basic Plus Demo 1.1.2
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -151,8 +151,12 @@ <h3>Demo Notes</h3>
         autoUpload: false,
         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
         maxFileSize: 5000000, // 5 MB
-        loadImageMaxFileSize: 15000000, // 15MB
-        disableImageResize: false,
+        loadImageMaxFileSize: 15000000, // 10MB
+        // Enable image resizing, except for Android and Opera,
+        // which actually support image resizing, but fail to
+        // send Blob objects via XHR requests:
+        disableImageResize: /Android(?!.*Chrome)|Opera/
+            .test(window.navigator && navigator.userAgent),
         previewMaxWidth: 100,
         previewMaxHeight: 100,
         previewCrop: true
diff --git a/js/app.js b/js/app.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin Angular JS Example 1.0.2
+ * jQuery File Upload Plugin Angular JS Example 1.0.3
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -9,7 +9,8 @@
  * http://www.opensource.org/licenses/MIT
  */
 
-/*global window, angular */
+/*jslint regexp: true */
+/*global window, angular, navigator */
 
 (function () {
     'use strict';
@@ -28,7 +29,11 @@
                     // Demo settings:
                     delete $httpProvider.defaults.headers.common['X-Requested-With'];
                     angular.extend(fileUploadProvider.defaults, {
-                        disableImageResize: false,
+                        // Enable image resizing, except for Android and Opera,
+                        // which actually support image resizing, but fail to
+                        // send Blob objects via XHR requests:
+                        disableImageResize: /Android(?!.*Chrome)|Opera/
+                            .test(window.navigator && navigator.userAgent),
                         maxFileSize: 5000000,
                         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
                     });
