Skip to content

Commit

Permalink
Merged development branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Chad Robinson (LOCAL) committed Nov 27, 2017
2 parents 5ddde2d + d1ed242 commit 5ea4754
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 28 deletions.
15 changes: 10 additions & 5 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 @@ -978,7 +978,11 @@ ngFileUpload.service('Upload', ['$parse', '$timeout', '$compile', '$q', 'UploadE
var invalidModel = upload.attrGetter('ngfModelInvalid', attr);
if (invalidModel) {
$timeout(function () {
$parse(invalidModel).assign(scope, isSingleModel ? invalidFile : invalidFiles);
if (invalidModel.includes('(')){
$parse(invalidModel)(scope, {$invalidFile: invalidFile, $invalidFiles: invalidFiles});
} else {
$parse(invalidModel).assign(scope, isSingleModel ? invalidFile : invalidFiles);
}
});
}
$timeout(function () {
Expand Down Expand Up @@ -1041,8 +1045,8 @@ ngFileUpload.service('Upload', ['$parse', '$timeout', '$compile', '$q', 'UploadE
if (validateAfterResize) {
upload.validate(allNewFiles, keep ? prevValidFiles.length : 0, ngModel, attr, scope)
.then(function (validationResult) {
valids = validationResult.validsFiles;
invalids = validationResult.invalidsFiles;
valids = validationResult.validFiles;
invalids = validationResult.invalidFiles;
updateModel();
});
} else {
Expand Down Expand Up @@ -2096,14 +2100,15 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct

el.on('loadedmetadata', success);
el.on('error', error);

var count = 0;

function checkLoadError() {
count++;
$timeout(function () {
if (el[0].parentNode) {
if (el[0].duration) {
success();
} else if (count > 10) {
} else if (count++ > 10) {
error();
} else {
checkLoadError();
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.

15 changes: 10 additions & 5 deletions demo/src/main/webapp/js/ng-file-upload.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,11 @@ ngFileUpload.service('Upload', ['$parse', '$timeout', '$compile', '$q', 'UploadE
var invalidModel = upload.attrGetter('ngfModelInvalid', attr);
if (invalidModel) {
$timeout(function () {
$parse(invalidModel).assign(scope, isSingleModel ? invalidFile : invalidFiles);
if (invalidModel.includes('(')){
$parse(invalidModel)(scope, {$invalidFile: invalidFile, $invalidFiles: invalidFiles});
} else {
$parse(invalidModel).assign(scope, isSingleModel ? invalidFile : invalidFiles);
}
});
}
$timeout(function () {
Expand Down Expand Up @@ -619,8 +623,8 @@ ngFileUpload.service('Upload', ['$parse', '$timeout', '$compile', '$q', 'UploadE
if (validateAfterResize) {
upload.validate(allNewFiles, keep ? prevValidFiles.length : 0, ngModel, attr, scope)
.then(function (validationResult) {
valids = validationResult.validsFiles;
invalids = validationResult.invalidsFiles;
valids = validationResult.validFiles;
invalids = validationResult.invalidFiles;
updateModel();
});
} else {
Expand Down Expand Up @@ -1674,14 +1678,15 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct

el.on('loadedmetadata', success);
el.on('error', error);

var count = 0;

function checkLoadError() {
count++;
$timeout(function () {
if (el[0].parentNode) {
if (el[0].duration) {
success();
} else if (count > 10) {
} else if (count++ > 10) {
error();
} else {
checkLoadError();
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.

15 changes: 10 additions & 5 deletions dist/ng-file-upload-all.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,11 @@ ngFileUpload.service('Upload', ['$parse', '$timeout', '$compile', '$q', 'UploadE
var invalidModel = upload.attrGetter('ngfModelInvalid', attr);
if (invalidModel) {
$timeout(function () {
$parse(invalidModel).assign(scope, isSingleModel ? invalidFile : invalidFiles);
if (invalidModel.includes('(')){
$parse(invalidModel)(scope, {$invalidFile: invalidFile, $invalidFiles: invalidFiles});
} else {
$parse(invalidModel).assign(scope, isSingleModel ? invalidFile : invalidFiles);
}
});
}
$timeout(function () {
Expand Down Expand Up @@ -1041,8 +1045,8 @@ ngFileUpload.service('Upload', ['$parse', '$timeout', '$compile', '$q', 'UploadE
if (validateAfterResize) {
upload.validate(allNewFiles, keep ? prevValidFiles.length : 0, ngModel, attr, scope)
.then(function (validationResult) {
valids = validationResult.validsFiles;
invalids = validationResult.invalidsFiles;
valids = validationResult.validFiles;
invalids = validationResult.invalidFiles;
updateModel();
});
} else {
Expand Down Expand Up @@ -2096,14 +2100,15 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct

el.on('loadedmetadata', success);
el.on('error', error);

var count = 0;

function checkLoadError() {
count++;
$timeout(function () {
if (el[0].parentNode) {
if (el[0].duration) {
success();
} else if (count > 10) {
} else if (count++ > 10) {
error();
} else {
checkLoadError();
Expand Down
4 changes: 2 additions & 2 deletions dist/ng-file-upload-all.min.js
View file

Large diffs are not rendered by default.

15 changes: 10 additions & 5 deletions dist/ng-file-upload.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,11 @@ ngFileUpload.service('Upload', ['$parse', '$timeout', '$compile', '$q', 'UploadE
var invalidModel = upload.attrGetter('ngfModelInvalid', attr);
if (invalidModel) {
$timeout(function () {
$parse(invalidModel).assign(scope, isSingleModel ? invalidFile : invalidFiles);
if (invalidModel.includes('(')){
$parse(invalidModel)(scope, {$invalidFile: invalidFile, $invalidFiles: invalidFiles});
} else {
$parse(invalidModel).assign(scope, isSingleModel ? invalidFile : invalidFiles);
}
});
}
$timeout(function () {
Expand Down Expand Up @@ -619,8 +623,8 @@ ngFileUpload.service('Upload', ['$parse', '$timeout', '$compile', '$q', 'UploadE
if (validateAfterResize) {
upload.validate(allNewFiles, keep ? prevValidFiles.length : 0, ngModel, attr, scope)
.then(function (validationResult) {
valids = validationResult.validsFiles;
invalids = validationResult.invalidsFiles;
valids = validationResult.validFiles;
invalids = validationResult.invalidFiles;
updateModel();
});
} else {
Expand Down Expand Up @@ -1674,14 +1678,15 @@ ngFileUpload.service('UploadValidate', ['UploadDataUrl', '$q', '$timeout', funct

el.on('loadedmetadata', success);
el.on('error', error);

var count = 0;

function checkLoadError() {
count++;
$timeout(function () {
if (el[0].parentNode) {
if (el[0].duration) {
success();
} else if (count > 10) {
} else if (count++ > 10) {
error();
} else {
checkLoadError();
Expand Down
4 changes: 2 additions & 2 deletions dist/ng-file-upload.min.js
View file

Large diffs are not rendered by default.

0 comments on commit 5ea4754

Please sign in to comment.