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
|
@ -1,4 +1,11 @@
|
|||
var ScheduledTaskPage = {
|
||||
// Array Remove - By John Resig (MIT Licensed)
|
||||
Array.prototype.remove = function (from, to) {
|
||||
var rest = this.slice((to || from) + 1 || this.length);
|
||||
this.length = from < 0 ? this.length + from : from;
|
||||
return this.push.apply(this, rest);
|
||||
};
|
||||
|
||||
var ScheduledTaskPage = {
|
||||
|
||||
refreshScheduledTask: function () {
|
||||
Dashboard.showLoadingMsg();
|
||||
|
@ -6,7 +13,7 @@
|
|||
var id = getParameterByName('id');
|
||||
|
||||
|
||||
ApiClient.getScheduledTask(id).done(ScheduledTaskPage.loadScheduledTask);
|
||||
ApiClient.getScheduledTask(id).then(ScheduledTaskPage.loadScheduledTask);
|
||||
},
|
||||
|
||||
loadScheduledTask: function (task) {
|
||||
|
@ -177,11 +184,11 @@
|
|||
var id = getParameterByName('id');
|
||||
|
||||
|
||||
ApiClient.getScheduledTask(id).done(function (task) {
|
||||
ApiClient.getScheduledTask(id).then(function (task) {
|
||||
|
||||
task.Triggers.remove(index);
|
||||
|
||||
ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).done(function () {
|
||||
ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).then(function () {
|
||||
|
||||
ScheduledTaskPage.refreshScheduledTask();
|
||||
|
||||
|
@ -274,7 +281,7 @@
|
|||
var vals = val.split(':');
|
||||
|
||||
var hours = vals[0];
|
||||
var minutes = vals[1];
|
||||
var minutes = vals[1].split(' ')[0];
|
||||
|
||||
// Add hours
|
||||
var ticks = hours * 60 * 60 * 1000 * 10000;
|
||||
|
@ -293,11 +300,11 @@
|
|||
|
||||
var id = getParameterByName('id');
|
||||
|
||||
ApiClient.getScheduledTask(id).done(function (task) {
|
||||
ApiClient.getScheduledTask(id).then(function (task) {
|
||||
|
||||
task.Triggers.push(ScheduledTaskPage.getTriggerToAdd());
|
||||
|
||||
ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).done(function () {
|
||||
ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).then(function () {
|
||||
|
||||
$('#popupAddTrigger').popup('close');
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue