Update assets to v9.11.0

vrodokanakis · vrodokanakis · commit 5c2634e071f4 · 2015-08-14T14:18:00.000+03:00
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js
@@ -91,7 +91,7 @@
                     angular.forEach(data.files, function (file) {
                         filesCopy.push(file);
                     });
-                    scope.$apply(function () {
+                    scope.$parent.$applyAsync(function () {
                         addFileMethods(scope, data);
                         var method = scope.option('prependFiles') ?
                                 'unshift' : 'push';
@@ -100,7 +100,7 @@
                     data.process(function () {
                         return scope.process(data);
                     }).always(function () {
-                        scope.$apply(function () {
+                        scope.$parent.$applyAsync(function () {
                             addFileMethods(scope, data);
                             scope.replace(filesCopy, data.files);
                         });
@@ -320,9 +320,11 @@
                     'fileuploadprocessalways',
                     'fileuploadprocessstop'
                 ].join(' '), function (e, data) {
-                    if ($scope.$emit(e.type, data).defaultPrevented) {
-                        e.preventDefault();
-                    }
+                    $scope.$parent.$applyAsync(function () {
+                        if ($scope.$emit(e.type, data).defaultPrevented) {
+                            e.preventDefault();
+                        }
+                    });
                 }).on('remove', function () {
                     // Remove upload methods from the scope,
                     // when the widget is removed:
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js
@@ -242,7 +242,7 @@
                                     blob.name = file.name;
                                 } else if (file.name) {
                                     blob.name = file.name.replace(
-                                        /\..+$/,
+                                        /\.\w+$/,
                                         '.' + blob.type.substr(6)
                                     );
                                 }
diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload.js
@@ -277,7 +277,8 @@
             // The following are jQuery ajax settings required for the file uploads:
             processData: false,
             contentType: false,
-            cache: false
+            cache: false,
+            timeout: 0
         },
 
         // A list of options that require reinitializing event listeners and/or
@@ -983,7 +984,10 @@
                 fileSet,
                 i,
                 j = 0;
-            if (limitSize && (!filesLength || files[0].size === undefined)) {
+            if (!filesLength) {
+                return false;
+            }
+            if (limitSize && files[0].size === undefined) {
                 limitSize = undefined;
             }
             if (!(options.singleFileUploads || limit || limitSize) ||
diff --git a/app/assets/stylesheets/jquery.fileupload.scss b/app/assets/stylesheets/jquery.fileupload.scss
@@ -13,6 +13,7 @@
 .fileinput-button {
   position: relative;
   overflow: hidden;
+  display: inline-block;
 }
 .fileinput-button input {
   position: absolute;

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@`
`242`	`242`	`blob.name = file.name;`
`243`	`243`	`} else if (file.name) {`
`244`	`244`	`blob.name = file.name.replace(`
`245`		`- /\..+$/,`
	`245`	`+ /\.\w+$/,`
`246`	`246`	`'.' + blob.type.substr(6)`
`247`	`247`	`);`
`248`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`.fileinput-button {`
`14`	`14`	`position: relative;`
`15`	`15`	`overflow: hidden;`
	`16`	`+ display: inline-block;`
`16`	`17`	`}`
`17`	`18`	`.fileinput-button input {`
`18`	`19`	`position: absolute;`