mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #387 from jellyfin/release-10.3.z

Browse source 
Backmerge for Release 10.3.4, 10.3.5, and 10.3.6
This commit is contained in:
Joshua M. Boniface 2019-07-06 17:13:07 -04:00
commit d11167eae5
5 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/components/channelmapper/channelmapper.js
View file

@ -28,15 +28,18 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee
function onChannelsElementClick(e) {
var btnMap = parentWithClass(e.target, "btnMap");
if (btnMap) {
var channelId = btnMap.getAttribute("data-id"),
providerChannelId = btnMap.getAttribute("data-providerid"),
menuItems = currentMappingOptions.ProviderChannels.map(function(m) {
return {
name: m.Name,
id: m.Id,
selected: m.Id.toLowerCase() === providerChannelId.toLowerCase()
}
});
var channelId = btnMap.getAttribute("data-id");
var providerChannelId = btnMap.getAttribute("data-providerid");
var menuItems = currentMappingOptions.ProviderChannels.map(function(m) {
return {
name: m.Name,
id: m.Id,
selected: m.Id.toLowerCase() === providerChannelId.toLowerCase()
}
}).sort(function (a, b) {
return a.name.localeCompare(b.name);
});
actionsheet.show({
positionTo: btnMap,
items: menuItems
@ -93,4 +96,4 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee
})
}
}
});
});

2
src/components/recordingcreator/recordingfields.js
View file

@ -194,7 +194,7 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
var isChecked = !button.querySelector('i').classList.contains('recordingIcon-active');
if (isChecked) {
context.querySelector('.recordSeriesContainer').classList.remove('hide');
options.parent.querySelector('.recordSeriesContainer').classList.remove('hide');
if (!this.SeriesTimerId) {
var promise = this.TimerId ?
recordingHelper.changeRecordingToSeries(apiClient, this.TimerId, options.programId) :