From 4da30c0367b443c418b81e298252e8a744b5a49c Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Mon, 21 Sep 2015 19:41:26 +0200
Subject: Revert
 https://github.com/owncloud/gallery/commit/3618021c137310647c8200e23e6ad56899db2062

---
 js/galleryview.js | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

(limited to 'js/galleryview.js')

diff --git a/js/galleryview.js b/js/galleryview.js
index 07e3120f..499808ef 100644
--- a/js/galleryview.js
+++ b/js/galleryview.js
@@ -253,15 +253,14 @@
 			infoButton.find('span').hide();
 			var infoContentContainer = $('.album-info-container');
 			infoContentContainer.slideUp();
-			infoContentContainer.css('max-height',
-				$(window).height() - Gallery.browserToolbarHeight);
+			infoContentContainer.css('max-height', $(window).height() - Gallery.browserToolbarHeight);
 			var albumInfo = Gallery.config.albumInfo;
 			if (Gallery.config.albumError) {
 				infoButton.hide();
 				var text = '<strong>' + t('gallery', 'Configuration error') + '</strong></br>' +
 					Gallery.config.albumError.message + '</br></br>';
 				Gallery.utility.showHtmlNotification(text, 7);
-			} else if (this._isInfoContentEmpty(albumInfo)) {
+			} else if ($.isEmptyObject(albumInfo)) {
 				infoButton.hide();
 			} else {
 				infoButton.show();
@@ -271,23 +270,6 @@
 			}
 		},
 
-		/**
-		 * Determines if the info box is empty
-		 *
-		 * @param albumInfo
-		 * @returns {bool}
-		 * @private
-		 */
-		_isInfoContentEmpty: function (albumInfo) {
-			return $.isEmptyObject(albumInfo)
-				|| (
-					!albumInfo.description
-					&& !albumInfo.descriptionLink
-					&& !albumInfo.copyright
-					&& !albumInfo.copyrightLink
-				);
-		},
-
 		/**
 		 * Sets the background colour of the photowall
 		 *
-- 
cgit v1.2.3