Merge remote-tracking branch 'upstream/master' into more-es6

This commit is contained in:
MrTimscampi 2020-08-06 22:39:11 +02:00
commit 936ff4186d
310 changed files with 9162 additions and 13374 deletions

View file

@ -2,6 +2,8 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
'use strict';
serverNotifications = serverNotifications.default || serverNotifications;
recordingHelper = recordingHelper.default || recordingHelper;
loading = loading.default || loading;
function loadData(parent, program, apiClient) {
if (program.IsSeries) {
@ -36,7 +38,6 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
}
function fetchData(instance) {
var options = instance.options;
var apiClient = connectionManager.getApiClient(options.serverId);
@ -123,7 +124,6 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
}
function onManageSeriesRecordingClick(e) {
var options = this.options;
if (!this.SeriesTimerId) {
@ -133,7 +133,6 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
var self = this;
require(['seriesRecordingEditor'], function (seriesRecordingEditor) {
seriesRecordingEditor.show(self.SeriesTimerId, options.serverId, {
enableCancel: false
@ -145,7 +144,6 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
}
function onRecordChange(e) {
this.changed = true;
var self = this;
@ -185,7 +183,6 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
}
function onRecordSeriesChange(e) {
this.changed = true;
var self = this;