recycle SharedFileInfo values in fileInfo
fileInfo is composed of data from sharing, however additional data is pulled when sidebar opens, e.g. the size. Then, existing data is overwritten by data from the other source (files). The data points that would be lost are not dirty however and still used, so we keep them. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
parent
b3b34c08d1
commit
5a9c99e6ac
|
@ -553,9 +553,6 @@
|
||||||
actionsWidth += $(action).outerWidth();
|
actionsWidth += $(action).outerWidth();
|
||||||
});
|
});
|
||||||
|
|
||||||
// subtract app navigation toggle when visible
|
|
||||||
containerWidth -= $('#app-navigation-toggle').width();
|
|
||||||
|
|
||||||
this.breadcrumb._resize();
|
this.breadcrumb._resize();
|
||||||
|
|
||||||
this.$table.find('>thead').width($('#app-content').width() - OC.Util.getScrollBarWidth());
|
this.$table.find('>thead').width($('#app-content').width() - OC.Util.getScrollBarWidth());
|
||||||
|
@ -1369,7 +1366,7 @@
|
||||||
* @return new tr element (not appended to the table)
|
* @return new tr element (not appended to the table)
|
||||||
*/
|
*/
|
||||||
add: function(fileData, options) {
|
add: function(fileData, options) {
|
||||||
var index = -1;
|
var index;
|
||||||
var $tr;
|
var $tr;
|
||||||
var $rows;
|
var $rows;
|
||||||
var $insertionPoint;
|
var $insertionPoint;
|
||||||
|
|
|
@ -153,6 +153,27 @@
|
||||||
// storage info like free space / used space
|
// storage info like free space / used space
|
||||||
},
|
},
|
||||||
|
|
||||||
|
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);
|
||||||
|
},
|
||||||
|
|
||||||
reload: function() {
|
reload: function() {
|
||||||
this.showMask();
|
this.showMask();
|
||||||
if (this._reloadCall) {
|
if (this._reloadCall) {
|
||||||
|
@ -225,7 +246,6 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
_makeFilesFromRemoteShares: function(data) {
|
_makeFilesFromRemoteShares: function(data) {
|
||||||
var self = this;
|
|
||||||
var files = data;
|
var files = data;
|
||||||
|
|
||||||
files = _.chain(files)
|
files = _.chain(files)
|
||||||
|
|
|
@ -161,7 +161,6 @@ OC.Share = _.extend(OC.Share || {}, {
|
||||||
updateIcon:function(itemType, itemSource) {
|
updateIcon:function(itemType, itemSource) {
|
||||||
var shares = false;
|
var shares = false;
|
||||||
var link = false;
|
var link = false;
|
||||||
var image = OC.imagePath('core', 'actions/share');
|
|
||||||
var iconClass = '';
|
var iconClass = '';
|
||||||
$.each(OC.Share.itemShares, function(index) {
|
$.each(OC.Share.itemShares, function(index) {
|
||||||
if (OC.Share.itemShares[index]) {
|
if (OC.Share.itemShares[index]) {
|
||||||
|
|
Loading…
Reference in New Issue