From 86e1eaf370ff5c290805bac130f3c3bbd1d1c774 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 10 Aug 2015 15:57:21 +0200
Subject: Inline actions using default renderer are now always permanent

Default renderer like the favorite icon can decide whether to use the
permanent class or not.

Fixed sharing code to properly update the icon according to sharing
state modifications.
---
 apps/files/js/fileactions.js             | 1 +
 apps/files_sharing/tests/js/shareSpec.js | 6 +++---
 core/js/share.js                         | 4 +---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 0d9161c6eb4..5ec26d8b334 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -308,6 +308,7 @@
 
 				var $actionLink = this._makeActionLink(params, context);
 				context.$file.find('a.name>span.fileactions').append($actionLink);
+				$actionLink.addClass('permanent');
 				return $actionLink;
 			}
 		},
diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js
index aa409285ca4..581e15caf93 100644
--- a/apps/files_sharing/tests/js/shareSpec.js
+++ b/apps/files_sharing/tests/js/shareSpec.js
@@ -97,7 +97,7 @@ describe('OCA.Sharing.Util tests', function() {
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
-			expect($action.hasClass('permanent')).toEqual(false);
+			expect($action.hasClass('permanent')).toEqual(true);
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder.svg');
 			expect($action.find('img').length).toEqual(1);
@@ -257,7 +257,7 @@ describe('OCA.Sharing.Util tests', function() {
 			$action = fileList.$el.find('tbody tr:first .action-share');
 			$tr = fileList.$el.find('tr:first');
 
-			expect($action.hasClass('permanent')).toEqual(false);
+			expect($action.hasClass('permanent')).toEqual(true);
 
 			$tr.find('.action-share').click();
 
@@ -344,7 +344,7 @@ describe('OCA.Sharing.Util tests', function() {
 			expect($tr.attr('data-share-recipients')).not.toBeDefined();
 
 			OC.Share.updateIcon('file', 1);
-			expect($action.hasClass('permanent')).toEqual(false);
+			expect($action.hasClass('permanent')).toEqual(true);
 		});
 		it('keep share text after updating reshare', function() {
 			var $action, $tr;
diff --git a/core/js/share.js b/core/js/share.js
index 99fd08c6411..57dd0dd6553 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -266,7 +266,6 @@ OC.Share={
 		if (hasShares || owner) {
 			recipients = $tr.attr('data-share-recipients');
 
-			action.addClass('permanent');
 			message = t('core', 'Shared');
 			// even if reshared, only show "Shared by"
 			if (owner) {
@@ -281,8 +280,7 @@ OC.Share={
 			}
 		}
 		else {
-			action.removeClass('permanent');
-			action.html(' <span>'+ escapeHTML(t('core', 'Share'))+'</span>').prepend(img);
+			action.html('<span></span>').prepend(img);
 		}
 		if (hasLink) {
 			image = OC.imagePath('core', 'actions/public');
-- 
cgit v1.2.3