diff --git a/.eslintrc.js b/.eslintrc.js
index 53dd01ff25..e2811f35a9 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -46,6 +46,7 @@ module.exports = {
'keyword-spacing': ['error'],
'no-throw-literal': ['error'],
'max-statements-per-line': ['error'],
+ 'max-params': ['error', 7],
'no-duplicate-imports': ['error'],
'no-empty-function': ['error'],
'no-floating-decimal': ['error'],
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index c867d81580..f3dbfec6da 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -59,6 +59,7 @@
- [Vankerkom](https://github.com/vankerkom)
- [edvwib](https://github.com/edvwib)
- [Rob Farraher](https://github.com/farraherbg)
+ - [Pier-Luc Ducharme](https://github.com/pl-ducharme)
# Emby Contributors
diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js
index 658837df83..a0c4aaf09b 100644
--- a/src/components/cardbuilder/cardBuilder.js
+++ b/src/components/cardbuilder/cardBuilder.js
@@ -773,27 +773,24 @@ import { appRouter } from '../appRouter';
* @param {Object} item - Item used to generate the footer text.
* @param {Object} apiClient - API client instance.
* @param {Object} options - Options used to generate the footer text.
- * @param {string} showTitle - Flag to show the title in the footer.
- * @param {boolean} forceName - Flag to force showing the name of the item.
- * @param {boolean} overlayText - Flag to show overlay text.
- * @param {Object} imgUrl - Object representing the card's image URL.
* @param {string} footerClass - CSS classes of the footer element.
* @param {string} progressHtml - HTML markup of the progress bar element.
- * @param {string} logoUrl - URL of the logo for the item.
- * @param {boolean} isOuterFooter - Flag to mark the text as outer footer.
+ * @param {Object} flags - Various flags for the footer
+ * @param {Object} urls - Various urls for the footer
* @returns {string} HTML markup of the card's footer text element.
*/
- function getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerClass, progressHtml, logoUrl, isOuterFooter) {
+ function getCardFooterText(item, apiClient, options, footerClass, progressHtml, flags, urls) {
item = item.ProgramInfo || item;
let html = '';
- if (logoUrl) {
- html += '';
+ if (urls.logoUrl) {
+ html += '';
}
- const showOtherText = isOuterFooter ? !overlayText : overlayText;
+ const showTitle = options.showTitle === 'auto' ? true : (options.showTitle || item.Type === 'PhotoAlbum' || item.Type === 'Folder');
+ const showOtherText = flags.isOuterFooter ? !flags.overlayText : flags.overlayText;
- if (isOuterFooter && options.cardLayout && layoutManager.mobile && options.cardFooterAside !== 'none') {
+ if (flags.isOuterFooter && options.cardLayout && layoutManager.mobile && options.cardFooterAside !== 'none') {
html += ``;
}
@@ -805,7 +802,7 @@ import { appRouter } from '../appRouter';
let titleAdded;
if (showOtherText && (options.showParentTitle || options.showParentTitleOrTitle) && !parentTitleUnderneath) {
- if (isOuterFooter && item.Type === 'Episode' && item.SeriesName) {
+ if (flags.isOuterFooter && item.Type === 'Episode' && item.SeriesName) {
if (item.SeriesId) {
lines.push(getTextActionButton({
Id: item.SeriesId,
@@ -835,7 +832,7 @@ import { appRouter } from '../appRouter';
}
let showMediaTitle = (showTitle && !titleAdded) || (options.showParentTitleOrTitle && !lines.length);
- if (!showMediaTitle && !titleAdded && (showTitle || forceName)) {
+ if (!showMediaTitle && !titleAdded && (showTitle || flags.forceName)) {
showMediaTitle = true;
}
@@ -856,7 +853,7 @@ import { appRouter } from '../appRouter';
if (showOtherText) {
if (options.showParentTitle && parentTitleUnderneath) {
- if (isOuterFooter && item.AlbumArtists && item.AlbumArtists.length) {
+ if (flags.isOuterFooter && item.AlbumArtists && item.AlbumArtists.length) {
item.AlbumArtists[0].Type = 'MusicArtist';
item.AlbumArtists[0].IsFolder = true;
lines.push(getTextActionButton(item.AlbumArtists[0], null, serverId));
@@ -991,23 +988,23 @@ import { appRouter } from '../appRouter';
}
}
- if ((showTitle || !imgUrl) && forceName && overlayText && lines.length === 1) {
+ if ((showTitle || !urls.imgUrl) && flags.forceName && flags.overlayText && lines.length === 1) {
lines = [];
}
- if (overlayText && showTitle) {
+ if (flags.overlayText && showTitle) {
lines = [escapeHtml(item.Name)];
}
- const addRightTextMargin = isOuterFooter && options.cardLayout && !options.centerText && options.cardFooterAside !== 'none' && layoutManager.mobile;
+ const addRightTextMargin = flags.isOuterFooter && options.cardLayout && !options.centerText && options.cardFooterAside !== 'none' && layoutManager.mobile;
- html += getCardTextLines(lines, cssClass, !options.overlayText, isOuterFooter, options.cardLayout, addRightTextMargin, options.lines);
+ html += getCardTextLines(lines, cssClass, !options.overlayText, flags.isOuterFooter, options.cardLayout, addRightTextMargin, options.lines);
if (progressHtml) {
html += progressHtml;
}
- if (html && (!isOuterFooter || logoUrl || options.cardLayout)) {
+ if (html && (!flags.isOuterFooter || urls.logoUrl || options.cardLayout)) {
html = '';
- html += '';
+ html += '';
return html;
}
@@ -226,7 +226,8 @@ import template from './imageeditor.template.html';
for (let i = 0, length = images.length; i < length; i++) {
const image = images[i];
- html += getCardHtml(image, i, length, apiClient, imageProviders, imageSize, tagName, enableFooterButtons);
+ const options = { index: i, numImages: length, imageProviders, imageSize, tagName, enableFooterButtons };
+ html += getCardHtml(image, apiClient, options);
}
elem.innerHTML = html;
diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index ffcd0e4d91..947f46eec8 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -299,20 +299,20 @@ function getAudioMaxValues(deviceProfile) {
}
let startingPlaySession = new Date().getTime();
-function getAudioStreamUrl(item, transcodingProfile, directPlayContainers, maxBitrate, apiClient, maxAudioSampleRate, maxAudioBitDepth, maxAudioBitrate, startPosition) {
+function getAudioStreamUrl(item, transcodingProfile, directPlayContainers, apiClient, startPosition, maxValues) {
const url = 'Audio/' + item.Id + '/universal';
startingPlaySession++;
return apiClient.getUrl(url, {
UserId: apiClient.getCurrentUserId(),
DeviceId: apiClient.deviceId(),
- MaxStreamingBitrate: maxAudioBitrate || maxBitrate,
+ MaxStreamingBitrate: maxValues.maxAudioBitrate || maxValues.maxBitrate,
Container: directPlayContainers,
TranscodingContainer: transcodingProfile.Container || null,
TranscodingProtocol: transcodingProfile.Protocol || null,
AudioCodec: transcodingProfile.AudioCodec,
- MaxAudioSampleRate: maxAudioSampleRate,
- MaxAudioBitDepth: maxAudioBitDepth,
+ MaxAudioSampleRate: maxValues.maxAudioSampleRate,
+ MaxAudioBitDepth: maxValues.maxAudioBitDepth,
api_key: apiClient.accessToken(),
PlaySessionId: startingPlaySession,
StartTimeTicks: startPosition || 0,
@@ -344,7 +344,7 @@ function getAudioStreamUrlFromDeviceProfile(item, deviceProfile, maxBitrate, api
const maxValues = getAudioMaxValues(deviceProfile);
- return getAudioStreamUrl(item, transcodingProfile, directPlayContainers, maxBitrate, apiClient, maxValues.maxAudioSampleRate, maxValues.maxAudioBitDepth, maxValues.maxAudioBitrate, startPosition);
+ return getAudioStreamUrl(item, transcodingProfile, directPlayContainers, apiClient, startPosition, { maxBitrate, ...maxValues });
}
function getStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPosition) {
@@ -377,7 +377,7 @@ function getStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPositio
let streamUrl;
if (item.MediaType === 'Audio' && !itemHelper.isLocalItem(item)) {
- streamUrl = getAudioStreamUrl(item, audioTranscodingProfile, audioDirectPlayContainers, maxBitrate, apiClient, maxValues.maxAudioSampleRate, maxValues.maxAudioBitDepth, maxValues.maxAudioBitrate, startPosition);
+ streamUrl = getAudioStreamUrl(item, audioTranscodingProfile, audioDirectPlayContainers, apiClient, startPosition, { maxBitrate, ...maxValues });
}
streamUrls.push(streamUrl || '');
@@ -408,27 +408,12 @@ function setStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPositio
});
}
-function getPlaybackInfo(player,
- apiClient,
- item,
- deviceProfile,
- maxBitrate,
- startPosition,
- isPlayback,
- mediaSourceId,
- audioStreamIndex,
- subtitleStreamIndex,
- liveStreamId,
- enableDirectPlay,
- enableDirectStream,
- allowVideoStreamCopy,
- allowAudioStreamCopy,
- secondarySubtitleStreamIndex) {
+function getPlaybackInfo(player, apiClient, item, deviceProfile, mediaSourceId, liveStreamId, options) {
if (!itemHelper.isLocalItem(item) && item.MediaType === 'Audio' && !player.useServerPlaybackInfoForAudio) {
return Promise.resolve({
MediaSources: [
{
- StreamUrl: getAudioStreamUrlFromDeviceProfile(item, deviceProfile, maxBitrate, apiClient, startPosition),
+ StreamUrl: getAudioStreamUrlFromDeviceProfile(item, deviceProfile, options.maxBitrate, apiClient, options.startPosition),
Id: item.Id,
MediaStreams: [],
RunTimeTicks: item.RunTimeTicks
@@ -446,10 +431,10 @@ function getPlaybackInfo(player,
const query = {
UserId: apiClient.getCurrentUserId(),
- StartTimeTicks: startPosition || 0
+ StartTimeTicks: options.startPosition || 0
};
- if (isPlayback) {
+ if (options.isPlayback) {
query.IsPlayback = true;
query.AutoOpenLiveStream = true;
} else {
@@ -457,27 +442,26 @@ function getPlaybackInfo(player,
query.AutoOpenLiveStream = false;
}
- if (audioStreamIndex != null) {
- query.AudioStreamIndex = audioStreamIndex;
+ if (options.audioStreamIndex != null) {
+ query.AudioStreamIndex = options.audioStreamIndex;
}
- if (subtitleStreamIndex != null) {
- query.SubtitleStreamIndex = subtitleStreamIndex;
+ if (options.subtitleStreamIndex != null) {
+ query.SubtitleStreamIndex = options.subtitleStreamIndex;
}
- if (secondarySubtitleStreamIndex != null) {
- query.SecondarySubtitleStreamIndex = secondarySubtitleStreamIndex;
+ if (options.secondarySubtitleStreamIndex != null) {
+ query.SecondarySubtitleStreamIndex = options.secondarySubtitleStreamIndex;
}
- if (enableDirectPlay != null) {
- query.EnableDirectPlay = enableDirectPlay;
+ if (options.enableDirectPlay != null) {
+ query.EnableDirectPlay = options.enableDirectPlay;
}
-
- if (enableDirectStream != null) {
- query.EnableDirectStream = enableDirectStream;
+ if (options.enableDirectStream != null) {
+ query.EnableDirectStream = options.enableDirectStream;
}
- if (allowVideoStreamCopy != null) {
- query.AllowVideoStreamCopy = allowVideoStreamCopy;
+ if (options.allowVideoStreamCopy != null) {
+ query.AllowVideoStreamCopy = options.allowVideoStreamCopy;
}
- if (allowAudioStreamCopy != null) {
- query.AllowAudioStreamCopy = allowAudioStreamCopy;
+ if (options.allowAudioStreamCopy != null) {
+ query.AllowAudioStreamCopy = options.allowAudioStreamCopy;
}
if (mediaSourceId) {
query.MediaSourceId = mediaSourceId;
@@ -485,8 +469,8 @@ function getPlaybackInfo(player,
if (liveStreamId) {
query.LiveStreamId = liveStreamId;
}
- if (maxBitrate) {
- query.MaxStreamingBitrate = maxBitrate;
+ if (options.maxBitrate) {
+ query.MaxStreamingBitrate = options.maxBitrate;
}
if (player.enableMediaProbe && !player.enableMediaProbe(item)) {
query.EnableMediaProbe = false;
@@ -537,7 +521,7 @@ function getOptimalMediaSource(apiClient, item, versions) {
});
}
-function getLiveStream(player, apiClient, item, playSessionId, deviceProfile, maxBitrate, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex) {
+function getLiveStream(player, apiClient, item, playSessionId, deviceProfile, mediaSource, options) {
const postData = {
DeviceProfile: deviceProfile,
OpenToken: mediaSource.OpenToken
@@ -545,19 +529,19 @@ function getLiveStream(player, apiClient, item, playSessionId, deviceProfile, ma
const query = {
UserId: apiClient.getCurrentUserId(),
- StartTimeTicks: startPosition || 0,
+ StartTimeTicks: options.startPosition || 0,
ItemId: item.Id,
PlaySessionId: playSessionId
};
- if (maxBitrate) {
- query.MaxStreamingBitrate = maxBitrate;
+ if (options.maxBitrate) {
+ query.MaxStreamingBitrate = options.maxBitrate;
}
- if (audioStreamIndex != null) {
- query.AudioStreamIndex = audioStreamIndex;
+ if (options.audioStreamIndex != null) {
+ query.AudioStreamIndex = options.audioStreamIndex;
}
- if (subtitleStreamIndex != null) {
- query.SubtitleStreamIndex = subtitleStreamIndex;
+ if (options.subtitleStreamIndex != null) {
+ query.SubtitleStreamIndex = options.subtitleStreamIndex;
}
// lastly, enforce player overrides for special situations
@@ -1737,7 +1721,19 @@ class PlaybackManager {
const currentPlayOptions = currentItem.playOptions || getDefaultPlayOptions();
- getPlaybackInfo(player, apiClient, currentItem, deviceProfile, maxBitrate, ticks, true, currentMediaSource.Id, audioStreamIndex, subtitleStreamIndex, liveStreamId, params.EnableDirectPlay, params.EnableDirectStream, params.AllowVideoStreamCopy, params.AllowAudioStreamCopy).then(function (result) {
+ const options = {
+ maxBitrate,
+ startPosition: ticks,
+ isPlayback: true,
+ audioStreamIndex,
+ subtitleStreamIndex,
+ enableDirectPlay: params.EnableDirectPlay,
+ enableDirectStream: params.EnableDirectStream,
+ allowVideoStreamCopy: params.AllowVideoStreamCopy,
+ allowAudioStreamCopy: params.AllowAudioStreamCopy
+ };
+
+ getPlaybackInfo(player, apiClient, currentItem, deviceProfile, currentMediaSource.Id, liveStreamId, options).then(function (result) {
if (validatePlaybackInfoResult(self, result)) {
currentMediaSource = result.MediaSources[0];
@@ -2303,17 +2299,17 @@ class PlaybackManager {
}, reject);
}
- function sendPlaybackListToPlayer(player, items, deviceProfile, maxBitrate, apiClient, startPositionTicks, mediaSourceId, audioStreamIndex, subtitleStreamIndex, startIndex) {
- return setStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPositionTicks).then(function () {
+ function sendPlaybackListToPlayer(player, items, deviceProfile, apiClient, mediaSourceId, options) {
+ return setStreamUrls(items, deviceProfile, options.maxBitrate, apiClient, options.startPosition).then(function () {
loading.hide();
return player.play({
- items: items,
- startPositionTicks: startPositionTicks || 0,
- mediaSourceId: mediaSourceId,
- audioStreamIndex: audioStreamIndex,
- subtitleStreamIndex: subtitleStreamIndex,
- startIndex: startIndex
+ items,
+ startPositionTicks: options.startPosition || 0,
+ mediaSourceId,
+ audioStreamIndex: options.audioStreamIndex,
+ subtitleStreamIndex: options.subtitleStreamIndex,
+ startIndex: options.startIndex
});
});
}
@@ -2474,15 +2470,27 @@ class PlaybackManager {
const mediaSourceId = playOptions.mediaSourceId;
const audioStreamIndex = playOptions.audioStreamIndex;
const subtitleStreamIndex = playOptions.subtitleStreamIndex;
+ const options = {
+ maxBitrate,
+ startPosition,
+ isPlayback: null,
+ audioStreamIndex,
+ subtitleStreamIndex,
+ startIndex: playOptions.startIndex,
+ enableDirectPlay: null,
+ enableDirectStream: null,
+ allowVideoStreamCopy: null,
+ allowAudioStreamCopy: null
+ };
if (player && !enableLocalPlaylistManagement(player)) {
- return sendPlaybackListToPlayer(player, playOptions.items, deviceProfile, maxBitrate, apiClient, startPosition, mediaSourceId, audioStreamIndex, subtitleStreamIndex, playOptions.startIndex);
+ return sendPlaybackListToPlayer(player, playOptions.items, deviceProfile, apiClient, mediaSourceId, options);
}
// this reference was only needed by sendPlaybackListToPlayer
playOptions.items = null;
- return getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, mediaSourceId, audioStreamIndex, subtitleStreamIndex).then(async (mediaSource) => {
+ return getPlaybackMediaSource(player, apiClient, deviceProfile, item, mediaSourceId, options).then(async (mediaSource) => {
const user = await apiClient.getCurrentUser();
autoSetNextTracks(prevSource, mediaSource, user.Configuration.RememberAudioSelections, user.Configuration.RememberSubtitleSelections);
@@ -2540,7 +2548,20 @@ class PlaybackManager {
const maxBitrate = getSavedMaxStreamingBitrate(ServerConnections.getApiClient(item.ServerId), mediaType);
return player.getDeviceProfile(item).then(function (deviceProfile) {
- return getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, options.mediaSourceId, options.audioStreamIndex, options.subtitleStreamIndex).then(function (mediaSource) {
+ const mediaOptions = {
+ maxBitrate,
+ startPosition,
+ isPlayback: null,
+ audioStreamIndex: options.audioStreamIndex,
+ subtitleStreamIndex: options.subtitleStreamIndex,
+ startIndex: null,
+ enableDirectPlay: null,
+ enableDirectStream: null,
+ allowVideoStreamCopy: null,
+ allowAudioStreamCopy: null
+ };
+
+ return getPlaybackMediaSource(player, apiClient, deviceProfile, item, options.mediaSourceId, mediaOptions).then(function (mediaSource) {
return createStreamInfo(apiClient, item.MediaType, item, mediaSource, startPosition, player);
});
});
@@ -2560,7 +2581,19 @@ class PlaybackManager {
const maxBitrate = getSavedMaxStreamingBitrate(ServerConnections.getApiClient(item.ServerId), mediaType);
return player.getDeviceProfile(item).then(function (deviceProfile) {
- return getPlaybackInfo(player, apiClient, item, deviceProfile, maxBitrate, startPosition, false, null, null, null, null).then(function (playbackInfoResult) {
+ const mediaOptions = {
+ maxBitrate,
+ startPosition,
+ isPlayback: true,
+ audioStreamIndex: null,
+ subtitleStreamIndex: null,
+ enableDirectPlay: null,
+ enableDirectStream: null,
+ allowVideoStreamCopy: null,
+ allowAudioStreamCopy: null
+ };
+
+ return getPlaybackInfo(player, apiClient, item, deviceProfile, null, null, mediaOptions).then(function (playbackInfoResult) {
return playbackInfoResult.MediaSources;
});
});
@@ -2701,13 +2734,18 @@ class PlaybackManager {
return tracks;
}
- function getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, mediaSourceId, audioStreamIndex, subtitleStreamIndex) {
- return getPlaybackInfo(player, apiClient, item, deviceProfile, maxBitrate, startPosition, true, mediaSourceId, audioStreamIndex, subtitleStreamIndex, null).then(function (playbackInfoResult) {
+ function getPlaybackMediaSource(player, apiClient, deviceProfile, item, mediaSourceId, options) {
+ options.isPlayback = true;
+
+ return getPlaybackInfo(player, apiClient, item, deviceProfile, mediaSourceId, null, options).then(function (playbackInfoResult) {
if (validatePlaybackInfoResult(self, playbackInfoResult)) {
return getOptimalMediaSource(apiClient, item, playbackInfoResult.MediaSources).then(function (mediaSource) {
if (mediaSource) {
if (mediaSource.RequiresOpening && !mediaSource.LiveStreamId) {
- return getLiveStream(player, apiClient, item, playbackInfoResult.PlaySessionId, deviceProfile, maxBitrate, startPosition, mediaSource, null, null).then(function (openLiveStreamResult) {
+ options.audioStreamIndex = null;
+ options.subtitleStreamIndex = null;
+
+ return getLiveStream(player, apiClient, item, playbackInfoResult.PlaySessionId, deviceProfile, mediaSource, options).then(function (openLiveStreamResult) {
return supportsDirectPlay(apiClient, item, openLiveStreamResult.MediaSource).then(function (result) {
openLiveStreamResult.MediaSource.enableDirectPlay = result;
return openLiveStreamResult.MediaSource;
diff --git a/src/components/userdatabuttons/userdatabuttons.js b/src/components/userdatabuttons/userdatabuttons.js
index c170a7cc0f..f75bbce81e 100644
--- a/src/components/userdatabuttons/userdatabuttons.js
+++ b/src/components/userdatabuttons/userdatabuttons.js
@@ -12,7 +12,10 @@ const userDataMethods = {
markFavorite: markFavorite
};
-function getUserDataButtonHtml(method, itemId, serverId, buttonCssClass, iconCssClass, icon, tooltip, style) {
+function getUserDataButtonHtml(method, itemId, serverId, icon, tooltip, style, classes) {
+ let buttonCssClass = classes.buttonCssClass;
+ let iconCssClass = classes.iconCssClass;
+
if (style === 'fab-mini') {
style = 'fab';
buttonCssClass = buttonCssClass ? (buttonCssClass + ' mini') : 'mini';
@@ -96,7 +99,7 @@ function getIconsHtml(options) {
}
const iconCssClass = options.iconCssClass;
-
+ const classes = { buttonCssClass: btnCssClass, iconCssClass: iconCssClass };
const serverId = item.ServerId;
if (includePlayed !== false) {
@@ -104,18 +107,21 @@ function getIconsHtml(options) {
if (itemHelper.canMarkPlayed(item)) {
if (userData.Played) {
- html += getUserDataButtonHtml('markPlayed', itemId, serverId, btnCssClass + ' btnUserDataOn', iconCssClass, 'check', tooltipPlayed, style);
+ const buttonCssClass = classes.buttonCssClass + ' btnUserDataOn';
+ html += getUserDataButtonHtml('markPlayed', itemId, serverId, 'check', tooltipPlayed, style, { buttonCssClass, ...classes });
} else {
- html += getUserDataButtonHtml('markPlayed', itemId, serverId, btnCssClass, iconCssClass, 'check', tooltipPlayed, style);
+ html += getUserDataButtonHtml('markPlayed', itemId, serverId, 'check', tooltipPlayed, style, classes);
}
}
}
const tooltipFavorite = globalize.translate('Favorite');
if (userData.IsFavorite) {
- html += getUserDataButtonHtml('markFavorite', itemId, serverId, btnCssClass + ' btnUserData btnUserDataOn', iconCssClass, 'favorite', tooltipFavorite, style);
+ const buttonCssClass = classes.buttonCssClass + ' btnUserData btnUserDataOn';
+ html += getUserDataButtonHtml('markFavorite', itemId, serverId, 'favorite', tooltipFavorite, style, { buttonCssClass, ...classes });
} else {
- html += getUserDataButtonHtml('markFavorite', itemId, serverId, btnCssClass + ' btnUserData', iconCssClass, 'favorite', tooltipFavorite, style);
+ classes.buttonCssClass += ' btnUserData';
+ html += getUserDataButtonHtml('markFavorite', itemId, serverId, 'favorite', tooltipFavorite, style, classes);
}
return html;