summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/js/file-upload.js2
-rw-r--r--core/js/sharedialogshareelistview.js3
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 8bcaa2e24aa..b3a59b54241 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -151,7 +151,7 @@ OC.FileUpload.prototype = {
/**
* Returns whether the upload is in progress
*
- * @return {bool}
+ * @return {boolean}
*/
isPending: function() {
return this.data.state() === 'pending';
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 7fcda92d5fd..a0a7bbfa2dc 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -367,6 +367,9 @@
checked = $element.is(':checked');
// Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck
$($checkboxes).prop('checked', checked);
+ if (checked) {
+ permissions |= OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE;
+ }
} else {
var numberChecked = $checkboxes.filter(':checked').length;
checked = numberChecked > 0;