Merge pull request #5310 from nextcloud/fix-tag-label-removed-when-share-view-is-opened

Fix tag label removed when share view is opened

3 files changed, 29 insertions, 0 deletions

diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js
index f04adcf1292..e53922ebb69 100644
--- a/apps/files/js/detailsview.js
+++ b/apps/files/js/detailsview.js
@@ -300,6 +300,16 @@
 		addDetailView: function(detailView) {
 			this._detailFileInfoViews.push(detailView);
 			this._dirty = true;
+		},
+
+		/**
+		 * Returns an array with the added DetailFileInfoViews.
+		 *
+		 * @return Array<OCA.Files.DetailFileInfoView> an array with the added
+		 *         DetailFileInfoViews.
+		 */
+		getDetailViews: function() {
+			return [].concat(this._detailFileInfoViews);
 		}
 	});
 
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 919b4d38f86..b1e7c3f5f8c 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -3020,6 +3020,21 @@
 			if (this.breadcrumb) {
 				this.breadcrumb.addDetailView(detailView);
 			}
+		},
+
+		/**
+		 * Returns the registered detail views.
+		 *
+		 * @return null|Array<OCA.Files.DetailFileInfoView> an array with the
+		 *         registered DetailFileInfoViews, or null if the details view
+		 *         is not enabled.
+		 */
+		getRegisteredDetailViews: function() {
+			if (this._detailsView) {
+				return this._detailsView.getDetailViews();
+			}
+
+			return null;
 		}
 	};
 
diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index 26472e0766d..ea3063f6176 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -171,6 +171,8 @@
 		 * Renders this details view
 		 */
 		render: function() {
+			this.trigger('pre-render');
+
 			if (this.model) {
 				var isFavorite = (this.model.get('tags') || []).indexOf(OC.TAG_FAVORITE) >= 0;
 				this.$el.html(this.template({
@@ -209,6 +211,8 @@
 				this.$el.empty();
 			}
 			this.delegateEvents();
+
+			this.trigger('post-render');
 		}
 	});