mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13723 from kofemann/patch-1 

apps: file-upload: fix typo in comments
This commit is contained in:
Roeland Jago Douma 2019-01-22 09:26:40 +01:00 committed by GitHub
parent dbc184c859 0573413134
commit 03290df8d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files/js/file-upload.js
View File

@ -194,7 +194,7 @@ OC.FileUpload.prototype = {
var data = this.data;
var file = this.getFile();
// it was a folder upload, so make sure the parent directory exists alrady
// it was a folder upload, so make sure the parent directory exists already
var folderPromise;
if (file.relativePath) {
folderPromise = this.uploader.ensureFolderExists(this.getFullPath());
@ -655,7 +655,7 @@ OC.Uploader.prototype = _.extend({
// when only replacement selected -> overwrite
self.onReplace(conflict.data('data'));
} else {
// when only original seleted -> skip
// when only original selected -> skip
// when none selected -> skip
self.onSkip(conflict.data('data'));
}