milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolve conflicts

Browse source
This commit is contained in:
MrTimscampi 2020-07-24 10:43:03 +02:00
parent 3713091382
commit 66b107f0c9
26 changed files with 91 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/cardbuilder/cardBuilder.js
View file

@ -1412,19 +1412,11 @@ import 'programStyles';
indicatorsHtml += indicators.getPlayedIndicatorHtml(item);
}
<<<<<<< HEAD
if (item.Type === 'CollectionFolder' || item.CollectionType) {
const refreshClass = item.RefreshProgress ? '' : ' class="hide"';
indicatorsHtml += '<div is="emby-itemrefreshindicator"' + refreshClass + ' data-progress="' + (item.RefreshProgress || 0) + '" data-status="' + item.RefreshStatus + '"></div>';
importRefreshIndicator();
}
=======
if (item.Type === 'CollectionFolder' || item.CollectionType) {
const refreshClass = item.RefreshProgress ? '' : ' class="hide"';
indicatorsHtml += '<div is="emby-itemrefreshindicator"' + refreshClass + ' data-progress="' + (item.RefreshProgress || 0) + '" data-status="' + item.RefreshStatus + '"></div>';
requireRefreshIndicator();
importRefreshIndicator();
}
>>>>>>> upstream/master
if (indicatorsHtml) {
cardImageContainerOpen += '<div class="cardIndicators">' + indicatorsHtml + '</div>';

6
src/components/itemidentifier/itemidentifier.js
View file

@ -240,11 +240,7 @@ import 'cardStyle';
html += '</div>';
html += '</div>';
<<<<<<< HEAD
let numLines = 2;
=======
var numLines = 3;
>>>>>>> upstream/master
let numLines = 3;
if (currentItemType === 'MusicAlbum') {
numLines++;
}

50
src/components/listview/listview.js
View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
/* eslint-disable indent */
/**
@ -13,13 +12,10 @@ import connectionManager from 'connectionManager';
import layoutManager from 'layoutManager';
import globalize from 'globalize';
import datetime from 'datetime';
import cardBuilder from 'cardBuilder';
import 'css!./listview';
import 'emby-ratingbutton';
import 'emby-playstatebutton';
=======
define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutManager', 'globalize', 'datetime', 'cardBuilder', 'css!./listview', 'emby-ratingbutton', 'emby-playstatebutton'], function (itemHelper, mediaInfo, indicators, connectionManager, layoutManager, globalize, datetime, cardBuilder) {
'use strict';
>>>>>>> upstream/master
function getIndex(item, options) {
@ -135,23 +131,11 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
}
function getTextLinesHtml(textlines, isLargeStyle) {
<<<<<<< HEAD
let html = '';
=======
var html = '';
>>>>>>> upstream/master
const largeTitleTagName = layoutManager.tv ? 'h2' : 'div';
<<<<<<< HEAD
for (let i = 0, length = textlines.length; i < length; i++) {
const text = textlines[i];
=======
for (const [i, text] of textlines.entries()) {
>>>>>>> upstream/master
if (!text) {
continue;
}
@ -305,26 +289,12 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
imageClass += ' itemAction';
}
<<<<<<< HEAD
const imageAction = playOnImageClick ? 'resume' : action;
let blurhashAttrib = '';
if (blurhash && blurhash.length > 0) {
blurhashAttrib = `data-blurhash="${blurhash}"`;
}
if (imgUrl) {
html += `<div data-action="${imageAction}" class="${imageClass} lazy" data-src="${imgUrl}" ${blurhashAttrib} item-icon>`;
} else {
html += `<div class="${imageClass}">`;
=======
var imageAction = playOnImageClick ? 'link' : action;
const imageAction = playOnImageClick ? 'link' : action;
if (imgUrl) {
html += '<div data-action="' + imageAction + '" class="' + imageClass + ' lazy" data-src="' + imgUrl + '" item-icon>';
} else {
html += '<div class="' + imageClass + ' cardImageContainer ' + cardBuilder.getDefaultBackgroundClass(item.Name) + '">' + cardBuilder.getDefaultText(item, options);
>>>>>>> upstream/master
}
let indicatorsHtml = '';
@ -518,13 +488,6 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><span class="material-icons playlist_add"></span></button>';
}
<<<<<<< HEAD
if (options.moreButton !== false) {
html += `<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="menu"><span class="material-icons ${moreIcon}"></span></button>`;
}
=======
>>>>>>> upstream/master
if (options.infoButton) {
html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><span class="material-icons info_outline"></span></button>';
}
@ -538,21 +501,12 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
const userData = item.UserData || {};
const likes = userData.Likes == null ? '' : userData.Likes;
<<<<<<< HEAD
if (itemHelper.canMarkPlayed(item)) {
html += `<button is="emby-playstatebutton" type="button" class="listItemButton paper-icon-button-light" data-id="${item.Id}" data-serverid="${item.ServerId}" data-itemtype="${item.Type}" data-played="${userData.Played}"><span class="material-icons check"></span></button>`;
}
if (itemHelper.canRate(item)) {
html += `<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="${item.Id}" data-serverid="${item.ServerId}" data-itemtype="${item.Type}" data-likes="${likes}" data-isfavorite="${userData.IsFavorite}"><span class="material-icons favorite"></span></button>`;
=======
if (itemHelper.canMarkPlayed(item) && options.enablePlayedButton !== false) {
html += '<button is="emby-playstatebutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><span class="material-icons check"></span></button>';
}
if (itemHelper.canRate(item) && options.enableRatingButton !== false) {
html += '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons favorite"></span></button>';
>>>>>>> upstream/master
}
}

58
src/components/nowPlayingBar/nowPlayingBar.js
View file

@ -394,12 +394,7 @@ import 'emby-ratingbutton';
// See bindEvents for why this is necessary
if (positionSlider && !positionSlider.dragging) {
if (runtimeTicks) {
<<<<<<< HEAD
let pct = positionTicks / runtimeTicks;
=======
var pct = positionTicks / runtimeTicks;
>>>>>>> upstream/master
pct *= 100;
positionSlider.value = pct;
@ -413,13 +408,7 @@ import 'emby-ratingbutton';
}
if (currentTimeElement) {
<<<<<<< HEAD
let timeText = positionTicks == null ? '--:--' : datetime.getDisplayRunningTime(positionTicks);
=======
var timeText = positionTicks == null ? '--:--' : datetime.getDisplayRunningTime(positionTicks);
>>>>>>> upstream/master
if (runtimeTicks) {
timeText += ' / ' + datetime.getDisplayRunningTime(runtimeTicks);
}
@ -540,25 +529,7 @@ import 'emby-ratingbutton';
const nowPlayingItem = state.NowPlayingItem;
<<<<<<< HEAD
const textLines = nowPlayingItem ? nowPlayingHelper.getNowPlayingNames(nowPlayingItem) : [];
if (textLines.length > 1) {
textLines[1].secondary = true;
}
nowPlayingTextElement.innerHTML = textLines.map(function (nowPlayingName) {
const cssClass = nowPlayingName.secondary ? ' class="nowPlayingBarSecondaryText"' : '';
if (nowPlayingName.item) {
const nowPlayingText = getTextActionButton(nowPlayingName.item, nowPlayingName.text);
return `<div ${cssClass}>${nowPlayingText}</div>`;
}
let nowPlayingText = '';
return `<div ${cssClass}>${nowPlayingText}</div>`;
}).join('');
=======
var textLines = nowPlayingItem ? nowPlayingHelper.getNowPlayingNames(nowPlayingItem) : [];
nowPlayingTextElement.innerHTML = '';
if (textLines) {
let itemText = document.createElement('div');
@ -581,7 +552,6 @@ import 'emby-ratingbutton';
nowPlayingTextElement.appendChild(itemText);
nowPlayingTextElement.appendChild(secondaryText);
}
>>>>>>> upstream/master
const imgHeight = 70;
@ -613,25 +583,8 @@ import 'emby-ratingbutton';
const apiClient = connectionManager.getApiClient(nowPlayingItem.ServerId);
apiClient.getItem(apiClient.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {
<<<<<<< HEAD
const userData = item.UserData || {};
const likes = userData.Likes == null ? '' : userData.Likes;
const contextButton = document.querySelector('.btnToggleContextMenu');
const options = {
play: false,
queue: false,
positionTo: contextButton
};
nowPlayingUserData.innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton mediaButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons favorite"></span></button>';
apiClient.getCurrentUser().then(function(user) {
contextButton.addEventListener('click', function () {
itemContextMenu.show(Object.assign({
item: item,
user: user
}, options ));
=======
var userData = item.UserData || {};
var likes = userData.Likes == null ? '' : userData.Likes;
if (!layoutManager.mobile) {
let contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu');
// We remove the previous event listener by replacing the item in each update event
@ -651,7 +604,6 @@ import 'emby-ratingbutton';
user: user
}, options));
});
>>>>>>> upstream/master
});
}
nowPlayingUserData.innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton mediaButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons favorite"></span></button>';
@ -664,13 +616,7 @@ import 'emby-ratingbutton';
function onPlaybackStart(e, state) {
console.debug('nowplaying event: ' + e.type);
<<<<<<< HEAD
const player = this;
=======
var player = this;
>>>>>>> upstream/master
onStateChanged.call(player, e, state);
}
@ -679,9 +625,6 @@ import 'emby-ratingbutton';
return;
}
<<<<<<< HEAD
const player = this;
=======
updateRepeatModeDisplay(playbackManager.getRepeatMode());
}
@ -689,7 +632,6 @@ import 'emby-ratingbutton';
if (!isEnabled) {
return;
}
>>>>>>> upstream/master
let shuffleMode = playbackManager.getQueueShuffleMode();
let context = nowPlayingBarElement;