diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index 3f996bb6d2..8970d857fc 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -51,8 +51,7 @@
initialize: function(options) {
var view = this;
- //FIXME: specific to reshares stuff
- this.model.on('change', function() {
+ this.model.on('change:reshare', function() {
view.render();
});
@@ -67,7 +66,7 @@
if ( !this.model.hasReshare()
|| !this.model.getReshareOwner() !== OC.currentUser)
{
- this.$el.html('');
+ this.$el.empty();
return this;
}
@@ -91,7 +90,8 @@
);
}
- this.$el.html(reshareTemplate({
+ this.$el.empty();
+ this.$el.append(reshareTemplate({
avatarEnabled: this.configModel.areAvatarsEnabled(),
sharedByText: sharedByText
}));
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 179d818e90..6701777863 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -14,7 +14,7 @@
}
var TEMPLATE_BASE =
- '{{{resharerInfo}}}' +
+ '
' +
'' +
'' +
' ' +
@@ -135,11 +135,8 @@
render: function() {
var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
- this.resharerInfoView.render();
-
this.$el.html(baseTemplate({
shareLabel: t('core', 'Share'),
- resharerInfo: this.resharerInfoView.el.innerHTML,
sharePlaceholder: this._renderSharePlaceholderPart(),
remoteShareInfo: this._renderRemoteShareInfoPart(),
linkShare: this._renderLinkSharePart(),
@@ -148,6 +145,9 @@
expiration: this._renderExpirationPart()
}));
+ this.resharerInfoView.$el = this.$el.find('.resharerInfo');
+ this.resharerInfoView.render();
+
this.$el.find('.hasTooltip').tooltip();
if(this.configModel.areAvatarsEnabled()) {
this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 0d2bce8b2e..9c4a8141cd 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -90,7 +90,8 @@
* @returns {boolean}
*/
hasReshare: function() {
- return _.isObject(this.get('reshare')) && !_.isUndefined(this.get('reshare').uid_owner);
+ var reshare = this.get('reshare');
+ return _.isObject(reshare) && !_.isUndefined(reshare.uid_owner);
},
/**