From 200a28255e058843465c63080d917170de293ee6 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 13 Feb 2017 17:49:05 -0600
Subject: Always enable avatars

* we introduced this setting in the begining because our
  avatar support caused some performance issues, but we
  fixed them and should only provide one way how Nextcloud
  looks

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 core/js/shareconfigmodel.js                |  3 ++-
 core/js/sharedialogresharerinfoview.js     | 13 ++++---------
 core/js/sharedialogshareelistview.js       | 28 ++++++++++------------------
 core/js/tests/specs/sharedialogviewSpec.js | 23 +----------------------
 4 files changed, 17 insertions(+), 50 deletions(-)

(limited to 'core/js')

diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 7c92853f682..98388cbd508 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -33,9 +33,10 @@
 
 		/**
 		 * @returns {boolean}
+		 * @deprecated here for legacy reasons - will always return true
 		 */
 		areAvatarsEnabled: function() {
-			return oc_config.enable_avatars === true;
+			return true;
 		},
 
 		/**
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index 9a9d95cfb60..a82b495bdcc 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -17,9 +17,7 @@
 
 	var TEMPLATE =
 		'<span class="reshare">' +
-		'    {{#if avatarEnabled}}' +
 		'    <div class="avatar" data-userName="{{reshareOwner}}"></div>' +
-		'    {{/if}}' +
 		'    {{sharedByText}}' +
 		'</span><br/>'
 		;
@@ -93,17 +91,14 @@
 			}
 
 			this.$el.html(reshareTemplate({
-				avatarEnabled: this.configModel.areAvatarsEnabled(),
 				reshareOwner: this.model.getReshareOwner(),
 				sharedByText: sharedByText
 			}));
 
-			if(this.configModel.areAvatarsEnabled()) {
-				this.$el.find('.avatar').each(function() {
-					var $this = $(this);
-					$this.avatar($this.data('username'), 32);
-				});
-			}
+			this.$el.find('.avatar').each(function() {
+				var $this = $(this);
+				$this.avatar($this.data('username'), 32);
+			});
 
 			return this;
 		},
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 4647dedd722..47dc62d14fe 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -21,9 +21,7 @@
 			'<ul id="shareWithList" class="shareWithList">' +
 			'{{#each sharees}}' +
 				'<li data-share-id="{{shareId}}" data-share-type="{{shareType}}" data-share-with="{{shareWith}}">' +
-					'{{#if avatarEnabled}}' +
 					'<div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" data-displayname="{{shareWithDisplayName}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' +
-					'{{/if}}' +
 					'<span class="has-tooltip username" title="{{shareWithTitle}}">{{shareWithDisplayName}}</span>' +
 					'<span class="sharingOptionsGroup">' +
 						'{{#if editPermissionPossible}}' +
@@ -41,9 +39,7 @@
 			'{{/each}}' +
 			'{{#each linkReshares}}' +
 				'<li data-share-id="{{shareId}}" data-share-type="{{shareType}}">' +
-					'{{#if avatarEnabled}}' +
 					'<div class="avatar" data-username="{{shareInitiator}}"></div>' +
-					'{{/if}}' +
 					'<span class="has-tooltip username" title="{{shareInitiator}}">' + t('core', '{{shareInitiatorDisplayName}} shared via link') + '</span>' +
 
 					'<span class="sharingOptionsGroup">' +
@@ -193,7 +189,6 @@
 
 		getShareProperties: function() {
 			return {
-				avatarEnabled: this.configModel.areAvatarsEnabled(),
 				unshareLabel: t('core', 'Unshare'),
 				canShareLabel: t('core', 'can reshare'),
 				canEditLabel: t('core', 'can edit'),
@@ -247,7 +242,6 @@
 		getLinkReshares: function() {
 			var universal = {
 				unshareLabel: t('core', 'Unshare'),
-				avatarEnabled: this.configModel.areAvatarsEnabled(),
 			};
 
 			if(!this.model.hasUserShares()) {
@@ -281,18 +275,16 @@
 					linkReshares: this.getLinkReshares()
 				}));
 
-				if (this.configModel.areAvatarsEnabled()) {
-					this.$('.avatar').each(function () {
-						var $this = $(this);
-						if ($this.hasClass('imageplaceholderseed')) {
-							$this.css({width: 32, height: 32});
-							$this.imageplaceholder($this.data('seed'));
-						} else {
-						    //                         user,   size,  ie8fix, hidedefault,  callback, displayname
-							$this.avatar($this.data('username'), 32, undefined, undefined, undefined, $this.data('displayname'));
-						}
-					});
-				}
+				this.$('.avatar').each(function () {
+					var $this = $(this);
+					if ($this.hasClass('imageplaceholderseed')) {
+						$this.css({width: 32, height: 32});
+						$this.imageplaceholder($this.data('seed'));
+					} else {
+						//                         user,   size,  ie8fix, hidedefault,  callback, displayname
+						$this.avatar($this.data('username'), 32, undefined, undefined, undefined, $this.data('displayname'));
+					}
+				});
 
 				this.$('.has-tooltip').tooltip({
 					placement: 'bottom'
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index cbb74714ff7..307adea85ff 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -24,7 +24,6 @@ describe('OC.Share.ShareDialogView', function() {
 	var $container;
 	var oldAppConfig;
 	var autocompleteStub;
-	var oldEnableAvatars;
 	var avatarStub;
 	var placeholderStub;
 	var oldCurrentUser;
@@ -103,8 +102,6 @@ describe('OC.Share.ShareDialogView', function() {
 			return $el;
 		});
 
-		oldEnableAvatars = oc_config.enable_avatars;
-		oc_config.enable_avatars = false;
 		avatarStub = sinon.stub($.fn, 'avatar');
 		placeholderStub = sinon.stub($.fn, 'imageplaceholder');
 
@@ -123,7 +120,6 @@ describe('OC.Share.ShareDialogView', function() {
 		autocompleteStub.restore();
 		avatarStub.restore();
 		placeholderStub.restore();
-		oc_config.enable_avatars = oldEnableAvatars;
 	});
 	describe('Share with link', function() {
 		// TODO: test ajax calls
@@ -440,18 +436,13 @@ describe('OC.Share.ShareDialogView', function() {
 
 		describe('avatars enabled', function() {
 			beforeEach(function() {
-				oc_config.enable_avatars = true;
 				avatarStub.reset();
 				dialog.render();
 			});
 
-			afterEach(function() {
-				oc_config.enable_avatars = false;
-			});
-
 			it('test correct function calls', function() {
 				expect(avatarStub.calledTwice).toEqual(true);
-				expect(placeholderStub.calledTwice).toEqual(true);
+				expect(placeholderStub.callCount).toEqual(4);
 				expect(dialog.$('.shareWithList').children().length).toEqual(3);
 				expect(dialog.$('.avatar').length).toEqual(4);
 			});
@@ -481,18 +472,6 @@ describe('OC.Share.ShareDialogView', function() {
 				expect(args[0]).toEqual('foo@bar.com/baz ' + OC.Share.SHARE_TYPE_REMOTE);
 			});
 		});
-
-		describe('avatars disabled', function() {
-			beforeEach(function() {
-				dialog.render();
-			});
-
-			it('no avatar classes', function() {
-				expect($('.avatar').length).toEqual(0);
-				expect(avatarStub.callCount).toEqual(0);
-				expect(placeholderStub.callCount).toEqual(0);
-			});
-		});
 	});
 	describe('remote sharing', function() {
 		it('shows remote share info when allowed', function() {
-- 
cgit v1.2.3