summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-01-22 09:26:40 +0100
committerGitHub <noreply@github.com>2019-01-22 09:26:40 +0100
commit03290df8d4cef4b1dbbcebf67c9302757cc405fb (patch)
tree0e1f1e693df06dd2891ca7e8bbe7c76723712b75 /apps/files
parentdbc184c85980b90f30881d249010f69b6f60800c (diff)
parent05734131345809f61444388daf4d845e70079283 (diff)
downloadnextcloud-server-03290df8d4cef4b1dbbcebf67c9302757cc405fb.tar.gz
nextcloud-server-03290df8d4cef4b1dbbcebf67c9302757cc405fb.zip
Merge pull request #13723 from kofemann/patch-1
apps: file-upload: fix typo in comments
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/file-upload.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index ed7cd4c2a66..bc1a4b36794 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -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'));
}