Skip to content

Commit

Permalink
fixed #1691 fixed #1689
Browse files Browse the repository at this point in the history
  • Loading branch information
@danialfarid
danialfarid committed Sep 7, 2016
1 parent 20bd3d5 commit b885933
Show file tree
Hide file tree
Showing 18 changed files with 81 additions and 71 deletions.
2 changes: 1 addition & 1 deletion demo/src/main/webapp/js/FileAPI.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions demo/src/main/webapp/js/ng-file-upload-all.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* progress, resize, thumbnail, preview, validation and CORS
* FileAPI Flash shim for old browsers not supporting FormData
* @author Danial <[email protected]>
* @version 12.2.6
* @version 12.2.7
*/

(function () {
Expand Down Expand Up @@ -424,7 +424,7 @@ if (!window.FileReader) {
* AngularJS file upload directives and services. Supoorts: file upload/drop/paste, resume, cancel/abort,
* progress, resize, thumbnail, preview, validation and CORS
* @author Danial <[email protected]>
* @version 12.2.6
* @version 12.2.7
*/

if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) {
Expand All @@ -445,7 +445,7 @@ if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) {

var ngFileUpload = angular.module('ngFileUpload', []);

ngFileUpload.version = '12.2.6';
ngFileUpload.version = '12.2.7';

ngFileUpload.service('UploadBase', ['$http', '$q', '$timeout', function ($http, $q, $timeout) {
var upload = this;
Expand Down Expand Up @@ -907,7 +907,7 @@ ngFileUpload.service('Upload', ['$parse', '$timeout', '$compile', '$q', 'UploadE
if (!resizeVal || !upload.isResizeSupported() || !files.length) return upload.emptyPromise();
if (resizeVal instanceof Function) {
var defer = $q.defer();
resizeVal(files).then(function (p) {
return resizeVal(files).then(function (p) {
resizeWithParams(p, files, attr, scope).then(function (r) {
defer.resolve(r);
}, function (e) {
Expand Down Expand Up @@ -1837,7 +1837,7 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct
}
}

var promises = [upload.emptyPromise()];
var promises = [upload.emptyPromise(true)];
if (files) {
files = files.length === undefined ? [files] : files;
angular.forEach(files, function (file) {
Expand Down Expand Up @@ -1868,14 +1868,16 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct
});
}
var deffer = $q.defer();
$q.all(promises).then(function (value) {
if (value) {
ngModel.$ngfValidations.push({name: name, valid: true});
deffer.resolve(true);
} else {
ngModel.$ngfValidations.push({name: name, valid: false});
deffer.resolve(false);
$q.all(promises).then(function (values) {
var isValid = true;
for (var i = 0; i < values.length; i++) {
if (!values[i]) {
isValid = false;
break;
}
}
ngModel.$ngfValidations.push({name: name, valid: isValid});
deffer.resolve(isValid);
});
return deffer.promise;
}
Expand Down
4 changes: 2 additions & 2 deletions demo/src/main/webapp/js/ng-file-upload-all.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo/src/main/webapp/js/ng-file-upload-shim.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* progress, resize, thumbnail, preview, validation and CORS
* FileAPI Flash shim for old browsers not supporting FormData
* @author Danial <[email protected]>
* @version 12.2.6
* @version 12.2.7
*/

(function () {
Expand Down
2 changes: 1 addition & 1 deletion demo/src/main/webapp/js/ng-file-upload-shim.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 13 additions & 11 deletions demo/src/main/webapp/js/ng-file-upload.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* AngularJS file upload directives and services. Supoorts: file upload/drop/paste, resume, cancel/abort,
* progress, resize, thumbnail, preview, validation and CORS
* @author Danial <[email protected]>
* @version 12.2.6
* @version 12.2.7
*/

if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) {
Expand All @@ -23,7 +23,7 @@ if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) {

var ngFileUpload = angular.module('ngFileUpload', []);

ngFileUpload.version = '12.2.6';
ngFileUpload.version = '12.2.7';

ngFileUpload.service('UploadBase', ['$http', '$q', '$timeout', function ($http, $q, $timeout) {
var upload = this;
Expand Down Expand Up @@ -485,7 +485,7 @@ ngFileUpload.service('Upload', ['$parse', '$timeout', '$compile', '$q', 'UploadE
if (!resizeVal || !upload.isResizeSupported() || !files.length) return upload.emptyPromise();
if (resizeVal instanceof Function) {
var defer = $q.defer();
resizeVal(files).then(function (p) {
return resizeVal(files).then(function (p) {
resizeWithParams(p, files, attr, scope).then(function (r) {
defer.resolve(r);
}, function (e) {
Expand Down Expand Up @@ -1415,7 +1415,7 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct
}
}

var promises = [upload.emptyPromise()];
var promises = [upload.emptyPromise(true)];
if (files) {
files = files.length === undefined ? [files] : files;
angular.forEach(files, function (file) {
Expand Down Expand Up @@ -1446,14 +1446,16 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct
});
}
var deffer = $q.defer();
$q.all(promises).then(function (value) {
if (value) {
ngModel.$ngfValidations.push({name: name, valid: true});
deffer.resolve(true);
} else {
ngModel.$ngfValidations.push({name: name, valid: false});
deffer.resolve(false);
$q.all(promises).then(function (values) {
var isValid = true;
for (var i = 0; i < values.length; i++) {
if (!values[i]) {
isValid = false;
break;
}
}
ngModel.$ngfValidations.push({name: name, valid: isValid});
deffer.resolve(isValid);
});
return deffer.promise;
}
Expand Down
4 changes: 2 additions & 2 deletions demo/src/main/webapp/js/ng-file-upload.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/FileAPI.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions dist/ng-file-upload-all.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* progress, resize, thumbnail, preview, validation and CORS
* FileAPI Flash shim for old browsers not supporting FormData
* @author Danial <[email protected]>
* @version 12.2.6
* @version 12.2.7
*/

(function () {
Expand Down Expand Up @@ -424,7 +424,7 @@ if (!window.FileReader) {
* AngularJS file upload directives and services. Supoorts: file upload/drop/paste, resume, cancel/abort,
* progress, resize, thumbnail, preview, validation and CORS
* @author Danial <[email protected]>
* @version 12.2.6
* @version 12.2.7
*/

if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) {
Expand All @@ -445,7 +445,7 @@ if (window.XMLHttpRequest && !(window.FileAPI && FileAPI.shouldLoad)) {

var ngFileUpload = angular.module('ngFileUpload', []);

ngFileUpload.version = '12.2.6';
ngFileUpload.version = '12.2.7';

ngFileUpload.service('UploadBase', ['$http', '$q', '$timeout', function ($http, $q, $timeout) {
var upload = this;
Expand Down Expand Up @@ -907,7 +907,7 @@ ngFileUpload.service('Upload', ['$parse', '$timeout', '$compile', '$q', 'UploadE
if (!resizeVal || !upload.isResizeSupported() || !files.length) return upload.emptyPromise();
if (resizeVal instanceof Function) {
var defer = $q.defer();
resizeVal(files).then(function (p) {
return resizeVal(files).then(function (p) {
resizeWithParams(p, files, attr, scope).then(function (r) {
defer.resolve(r);
}, function (e) {
Expand Down Expand Up @@ -1837,7 +1837,7 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct
}
}

var promises = [upload.emptyPromise()];
var promises = [upload.emptyPromise(true)];
if (files) {
files = files.length === undefined ? [files] : files;
angular.forEach(files, function (file) {
Expand Down Expand Up @@ -1868,14 +1868,16 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct
});
}
var deffer = $q.defer();
$q.all(promises).then(function (value) {
if (value) {
ngModel.$ngfValidations.push({name: name, valid: true});
deffer.resolve(true);
} else {
ngModel.$ngfValidations.push({name: name, valid: false});
deffer.resolve(false);
$q.all(promises).then(function (values) {
var isValid = true;
for (var i = 0; i < values.length; i++) {
if (!values[i]) {
isValid = false;
break;
}
}
ngModel.$ngfValidations.push({name: name, valid: isValid});
deffer.resolve(isValid);
});
return deffer.promise;
}
Expand Down
4 changes: 2 additions & 2 deletions dist/ng-file-upload-all.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ng-file-upload-shim.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* progress, resize, thumbnail, preview, validation and CORS
* FileAPI Flash shim for old browsers not supporting FormData
* @author Danial <[email protected]>
* @version 12.2.6
* @version 12.2.7
*/

(function () {
Expand Down
Loading

0 comments on commit b885933

Please sign in to comment.