summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2018-08-15 15:20:41 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2018-08-15 15:20:41 +0200
commit7f58f36b18ae4d243aff1675fceb776b6869f25e (patch)
treed4175717a1584a7f61632045f4081ed7636379a7 /apps
parentf7ae4771c8b056c72dc0a68e0d62be7d2407c0d2 (diff)
downloadnextcloud-server-7f58f36b18ae4d243aff1675fceb776b6869f25e.tar.gz
nextcloud-server-7f58f36b18ae4d243aff1675fceb776b6869f25e.zip
remove unexecutable code
OCA.Sharing.SharedFileInfo was never defined and that stopped execution. Interestingly, FF never showed me an error. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/js/sharedfilelist.js25
1 files changed, 4 insertions, 21 deletions
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index 71192497143..84e4e62f8a1 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -166,24 +166,7 @@
},
updateRow: function($tr, fileInfo, options) {
- if(!fileInfo instanceof OCA.Sharing.SharedFileInfo) {
- // recycle SharedFileInfo values if something tries to overwrite it
- var oldModel = this.getModelForFile($tr);
-
- if(_.isUndefined(fileInfo.recipientData) && oldModel.recipientData) {
- fileInfo.recipientData = oldModel.recipientData;
- }
- if(_.isUndefined(fileInfo.recipients) && oldModel.recipientData) {
- fileInfo.recipientData = oldModel.recipientData;
- }
- if(_.isUndefined(fileInfo.shares) && oldModel.shares) {
- fileInfo.shares = oldModel.shares;
- }
- if(_.isUndefined(fileInfo.shareOwner) && oldModel.shareOwner) {
- fileInfo.shareOwner = oldModel.shareOwner;
- }
- }
- OCA.Files.FileList.prototype._createRow.updateRow(this, arguments);
+ // no-op, suppress re-rendering
},
reload: function() {
@@ -328,11 +311,11 @@
* Converts the OCS API share response data to a file info
* list
* @param {Array} data OCS API share array
+ * @param {bool} sharedWithUser
* @return {Array.<OCA.Sharing.SharedFileInfo>} array of shared file info
*/
_makeFilesFromShares: function(data, sharedWithUser) {
/* jshint camelcase: false */
- var self = this;
var files = data;
if (this._linksOnly) {
@@ -447,8 +430,8 @@
// array of sorted names
data.mountType = 'shared';
delete data.recipientsCount;
- if (self._sharedWithUser) {
- // only for outgoing shres
+ if (sharedWithUser) {
+ // only for outgoing shares
delete data.shareTypes;
} else {
data.shareTypes = _.keys(data.shareTypes);