mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
merge from dev
This commit is contained in:
parent
1c8f02ce0f
commit
33b01d778c
911 changed files with 34157 additions and 57125 deletions
|
@ -8,7 +8,7 @@
|
|||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
ApiClient.cancelLiveTvTimer(id).done(function () {
|
||||
ApiClient.cancelLiveTvTimer(id).then(function () {
|
||||
|
||||
Dashboard.alert(Globalize.translate('MessageRecordingCancelled'));
|
||||
|
||||
|
@ -21,25 +21,25 @@
|
|||
|
||||
function renderTimers(page, timers) {
|
||||
|
||||
var html = LiveTvHelpers.getTimersHtml(timers);
|
||||
LiveTvHelpers.getTimersHtml(timers).then(function (html) {
|
||||
var elem = $('#items', page).html(html);
|
||||
|
||||
var elem = $('#items', page).html(html);
|
||||
$('.btnDeleteTimer', elem).on('click', function () {
|
||||
|
||||
$('.btnDeleteTimer', elem).on('click', function () {
|
||||
var id = this.getAttribute('data-timerid');
|
||||
|
||||
var id = this.getAttribute('data-timerid');
|
||||
deleteTimer(page, id);
|
||||
});
|
||||
|
||||
deleteTimer(page, id);
|
||||
Dashboard.hideLoadingMsg();
|
||||
});
|
||||
|
||||
Dashboard.hideLoadingMsg();
|
||||
}
|
||||
|
||||
function reload(page) {
|
||||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
ApiClient.getLiveTvTimers().done(function (result) {
|
||||
ApiClient.getLiveTvTimers().then(function (result) {
|
||||
|
||||
renderTimers(page, result.Items);
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue