Merge pull request #2850 from nextcloud/downstream-26603

Fixed size issues on main detail view and disappearing of share recipients (#26603)

3 files changed, 38 insertions, 20 deletions

diff --git a/apps/comments/js/commentmodel.js b/apps/comments/js/commentmodel.js
index e75c79b3f08..3711e53c9f3 100644
--- a/apps/comments/js/commentmodel.js
+++ b/apps/comments/js/commentmodel.js
@@ -9,7 +9,20 @@
  */
 
 (function(OC, OCA) {
-	var NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+	_.extend(OC.Files.Client, {
+		PROPERTY_FILEID:	'{' + OC.Files.Client.NS_OWNCLOUD + '}id',
+		PROPERTY_MESSAGE: 	'{' + OC.Files.Client.NS_OWNCLOUD + '}message',
+		PROPERTY_ACTORTYPE:	'{' + OC.Files.Client.NS_OWNCLOUD + '}actorType',
+		PROPERTY_ACTORID:	'{' + OC.Files.Client.NS_OWNCLOUD + '}actorId',
+		PROPERTY_ISUNREAD:	'{' + OC.Files.Client.NS_OWNCLOUD + '}isUnread',
+		PROPERTY_OBJECTID:	'{' + OC.Files.Client.NS_OWNCLOUD + '}objectId',
+		PROPERTY_OBJECTTYPE:	'{' + OC.Files.Client.NS_OWNCLOUD + '}objectType',
+		PROPERTY_ACTORDISPLAYNAME:	'{' + OC.Files.Client.NS_OWNCLOUD + '}actorDisplayName',
+		PROPERTY_CREATIONDATETIME:	'{' + OC.Files.Client.NS_OWNCLOUD + '}creationDateTime',
+		PROPERTY_MENTIONS: '{' + OC.Files.Client.NS_OWNCLOUD + '}mentions'
+	});
+
 	/**
 	 * @class OCA.Comments.CommentModel
 	 * @classdesc
@@ -27,16 +40,16 @@
 		},
 
 		davProperties: {
-			'id': '{' + NS_OWNCLOUD + '}id',
-			'message': '{' + NS_OWNCLOUD + '}message',
-			'actorType': '{' + NS_OWNCLOUD + '}actorType',
-			'actorId': '{' + NS_OWNCLOUD + '}actorId',
-			'actorDisplayName': '{' + NS_OWNCLOUD + '}actorDisplayName',
-			'creationDateTime': '{' + NS_OWNCLOUD + '}creationDateTime',
-			'objectType': '{' + NS_OWNCLOUD + '}objectType',
-			'objectId': '{' + NS_OWNCLOUD + '}objectId',
-			'isUnread': '{' + NS_OWNCLOUD + '}isUnread',
-			'mentions': '{' + NS_OWNCLOUD + '}mentions'
+			'id':	OC.Files.Client.PROPERTY_FILEID,
+			'message':	OC.Files.Client.PROPERTY_MESSAGE,
+			'actorType':	OC.Files.Client.PROPERTY_ACTORTYPE,
+			'actorId':	OC.Files.Client.PROPERTY_ACTORID,
+			'actorDisplayName':	OC.Files.Client.PROPERTY_ACTORDISPLAYNAME,
+			'creationDateTime':	OC.Files.Client.PROPERTY_CREATIONDATETIME,
+			'objectType':	OC.Files.Client.PROPERTY_OBJECTTYPE,
+			'objectId':	OC.Files.Client.PROPERTY_OBJECTID,
+			'isUnread':	OC.Files.Client.PROPERTY_ISUNREAD,
+			'mentions': OC.Files.Client.PROPERTY_MENTIONS
 		},
 
 		parse: function(data) {
@@ -78,4 +91,3 @@
 
 	OCA.Comments.CommentModel = CommentModel;
 })(OC, OCA);
-
diff --git a/apps/comments/js/commentsummarymodel.js b/apps/comments/js/commentsummarymodel.js
index d405315ca1f..ffabbc30fb4 100644
--- a/apps/comments/js/commentsummarymodel.js
+++ b/apps/comments/js/commentsummarymodel.js
@@ -9,13 +9,17 @@
  */
 
 (function(OC, OCA) {
-	var NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+	_.extend(OC.Files.Client, {
+		PROPERTY_READMARKER:	'{' + OC.Files.Client.NS_OWNCLOUD + '}readMarker'
+	});
+
 	/**
 	 * @class OCA.Comments.CommentSummaryModel
 	 * @classdesc
 	 *
 	 * Model containing summary information related to comments
-	 * like the read marker. 
+	 * like the read marker.
 	 *
 	 */
 	var CommentSummaryModel = OC.Backbone.Model.extend(
@@ -37,7 +41,7 @@
 		_objectId: null,
 
 		davProperties: {
-			'readMarker': '{' + NS_OWNCLOUD + '}readMarker'
+			'readMarker': OC.Files.Client.PROPERTY_READMARKER
 		},
 
 		/**
@@ -62,4 +66,3 @@
 
 	OCA.Comments.CommentSummaryModel = CommentSummaryModel;
 })(OC, OCA);
-
diff --git a/apps/comments/js/filesplugin.js b/apps/comments/js/filesplugin.js
index cc419c18ddb..8c5762065a1 100644
--- a/apps/comments/js/filesplugin.js
+++ b/apps/comments/js/filesplugin.js
@@ -11,6 +11,11 @@
 /* global Handlebars */
 
 (function() {
+
+	_.extend(OC.Files.Client, {
+		PROPERTY_COMMENTS_UNREAD:	'{' + OC.Files.Client.NS_OWNCLOUD + '}comments-unread'
+	});
+
 	var TEMPLATE_COMMENTS_UNREAD =
 		'<a class="action action-comment permanent" title="{{countMessage}}" href="#">' +
 		'<img class="svg" src="{{iconUrl}}"/>' +
@@ -52,19 +57,17 @@
 
 			fileList.registerTabView(new OCA.Comments.CommentsTabView('commentsTabView'));
 
-			var NS_OC = 'http://owncloud.org/ns';
-
 			var oldGetWebdavProperties = fileList._getWebdavProperties;
 			fileList._getWebdavProperties = function() {
 				var props = oldGetWebdavProperties.apply(this, arguments);
-				props.push('{' + NS_OC + '}comments-unread');
+				props.push(OC.Files.Client.PROPERTY_COMMENTS_UNREAD);
 				return props;
 			};
 
 			fileList.filesClient.addFileInfoParser(function(response) {
 				var data = {};
 				var props = response.propStat[0].properties;
-				var commentsUnread = props['{' + NS_OC + '}comments-unread'];
+				var commentsUnread = props[OC.Files.Client.PROPERTY_COMMENTS_UNREAD];
 				if (!_.isUndefined(commentsUnread) && commentsUnread !== '') {
 					data.commentsUnread = parseInt(commentsUnread, 10);
 				}