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

* fixed size issues on main detail view and disappearing of share recipients

* Changes due to code comments

* Moved reloadProperties() to FileInfoModel

* Solved Scrutinizer issues

* Bugfix: undefined value used on error

* check if options are set for FileInfoModel.initialize()

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

2 files changed, 38 insertions, 19 deletions

diff --git a/core/js/files/client.js b/core/js/files/client.js
index 87559b2084c..cde3afde9d7 100644
--- a/core/js/files/client.js
+++ b/core/js/files/client.js
@@ -31,9 +31,9 @@
 			this._root = this._root.substr(0, this._root.length - 1);
 		}
 
-		var url = 'http://';
+		var url = Client.PROTOCOL_HTTP + '://';
 		if (options.useHTTPS) {
-			url = 'https://';
+			url = Client.PROTOCOL_HTTPS + '://';
 		}
 
 		url += options.host + this._root;
@@ -64,6 +64,19 @@
 	Client.NS_OWNCLOUD = 'http://owncloud.org/ns';
 	Client.NS_NEXTCLOUD = 'http://nextcloud.org/ns';
 	Client.NS_DAV = 'DAV:';
+
+	Client.PROPERTY_GETLASTMODIFIED	= '{' + Client.NS_DAV + '}getlastmodified';
+	Client.PROPERTY_GETETAG	= '{' + Client.NS_DAV + '}getetag';
+	Client.PROPERTY_GETCONTENTTYPE	= '{' + Client.NS_DAV + '}getcontenttype';
+	Client.PROPERTY_RESOURCETYPE	= '{' + Client.NS_DAV + '}resourcetype';
+	Client.PROPERTY_INTERNAL_FILEID	= '{' + Client.NS_OWNCLOUD + '}fileid';
+	Client.PROPERTY_PERMISSIONS	= '{' + Client.NS_OWNCLOUD + '}permissions';
+	Client.PROPERTY_SIZE	= '{' + Client.NS_OWNCLOUD + '}size';
+	Client.PROPERTY_GETCONTENTLENGTH	= '{' + Client.NS_DAV + '}getcontentlength';
+
+	Client.PROTOCOL_HTTP	= 'http';
+	Client.PROTOCOL_HTTPS	= 'https';
+
 	Client._PROPFIND_PROPERTIES = [
 		/**
 		 * Modified time
@@ -259,23 +272,23 @@
 			var props = response.propStat[0].properties;
 
 			var data = {
-				id: props['{' + Client.NS_OWNCLOUD + '}fileid'],
+				id: props[Client.PROPERTY_INTERNAL_FILEID],
 				path: OC.dirname(path) || '/',
 				name: OC.basename(path),
-				mtime: (new Date(props['{' + Client.NS_DAV + '}getlastmodified'])).getTime()
+				mtime: (new Date(props[Client.PROPERTY_GETLASTMODIFIED])).getTime()
 			};
 
-			var etagProp = props['{' + Client.NS_DAV + '}getetag'];
+			var etagProp = props[Client.PROPERTY_GETETAG];
 			if (!_.isUndefined(etagProp)) {
 				data.etag = this._parseEtag(etagProp);
 			}
 
-			var sizeProp = props['{' + Client.NS_DAV + '}getcontentlength'];
+			var sizeProp = props[Client.PROPERTY_GETCONTENTLENGTH];
 			if (!_.isUndefined(sizeProp)) {
 				data.size = parseInt(sizeProp, 10);
 			}
 
-			sizeProp = props['{' + Client.NS_OWNCLOUD + '}size'];
+			sizeProp = props[Client.PROPERTY_SIZE];
 			if (!_.isUndefined(sizeProp)) {
 				data.size = parseInt(sizeProp, 10);
 			}
@@ -294,12 +307,12 @@
 				data.isFavorite = false;
 			}
 
-			var contentType = props['{' + Client.NS_DAV + '}getcontenttype'];
+			var contentType = props[Client.PROPERTY_GETCONTENTTYPE];
 			if (!_.isUndefined(contentType)) {
 				data.mimetype = contentType;
 			}
 
-			var resType = props['{' + Client.NS_DAV + '}resourcetype'];
+			var resType = props[Client.PROPERTY_RESOURCETYPE];
 			var isFile = true;
 			if (!data.mimetype && resType) {
 				var xmlvalue = resType[0];
@@ -310,7 +323,7 @@
 			}
 
 			data.permissions = OC.PERMISSION_READ;
-			var permissionProp = props['{' + Client.NS_OWNCLOUD + '}permissions'];
+			var permissionProp = props[Client.PROPERTY_PERMISSIONS];
 			if (!_.isUndefined(permissionProp)) {
 				var permString = permissionProp || '';
 				data.mountType = null;
@@ -752,7 +765,7 @@
 		},
 
 		/**
-		 * Returns the password 
+		 * Returns the password
 		 *
 		 * @since 11.0.0
 		 * @return {String} password
@@ -816,4 +829,3 @@
 
 	OC.Files.Client = Client;
 })(OC, OC.Files.FileInfo);
-
diff --git a/core/js/systemtags/systemtagmodel.js b/core/js/systemtags/systemtagmodel.js
index 89728357e25..72450a2abd0 100644
--- a/core/js/systemtags/systemtagmodel.js
+++ b/core/js/systemtags/systemtagmodel.js
@@ -9,7 +9,15 @@
  */
 
 (function(OC) {
-	var NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+	_.extend(OC.Files.Client, {
+		PROPERTY_FILEID:	'{' + OC.Files.Client.NS_OWNCLOUD + '}id',
+		PROPERTY_CAN_ASSIGN:'{' + OC.Files.Client.NS_OWNCLOUD + '}can-assign',
+		PROPERTY_DISPLAYNAME:	'{' + OC.Files.Client.NS_OWNCLOUD + '}display-name',
+		PROPERTY_USERVISIBLE:	'{' + OC.Files.Client.NS_OWNCLOUD + '}user-visible',
+		PROPERTY_USERASSIGNABLE:'{' + OC.Files.Client.NS_OWNCLOUD + '}user-assignable',
+	});
+
 	/**
 	 * @class OCA.SystemTags.SystemTagsCollection
 	 * @classdesc
@@ -28,12 +36,12 @@
 		},
 
 		davProperties: {
-			'id': '{' + NS_OWNCLOUD + '}id',
-			'name': '{' + NS_OWNCLOUD + '}display-name',
-			'userVisible': '{' + NS_OWNCLOUD + '}user-visible',
-			'userAssignable': '{' + NS_OWNCLOUD + '}user-assignable',
+			'id':	OC.Files.Client.PROPERTY_FILEID,
+			'name': OC.Files.Client.PROPERTY_DISPLAYNAME,
+			'userVisible': 	OC.Files.Client.PROPERTY_USERVISIBLE,
+			'userAssignable': 	OC.Files.Client.PROPERTY_USERASSIGNABLE,
 			// read-only, effective permissions computed by the server,
-			'canAssign': '{' + NS_OWNCLOUD + '}can-assign'
+			'canAssign': OC.Files.Client.PROPERTY_CAN_ASSIGN
 		},
 
 		parse: function(data) {
@@ -50,4 +58,3 @@
 	OC.SystemTags = OC.SystemTags || {};
 	OC.SystemTags.SystemTagModel = SystemTagModel;
 })(OC);
-