mirror/Anthias
1
0
Fork 0
mirror of https://github.com/Screenly/Anthias.git synced 2026-05-24 16:36:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Rusko124
2018-09-21 11:37:18 +06:00
parent 1eaefe80b3
commit acb2d3b9cb
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
static/js/screenly-ose.coffee
View File

@@ -339,7 +339,6 @@ API.View.EditAssetView = class EditAssetView extends Backbone.View
when "forever"
@setLoopDateTime (date_to current_date), (date_to end_date.setFullYear(9999))
when "manual"
@setLoopDateTime (date_to current_date), (date_to end_date.setDate(current_date.getDate() + 30))
@setDisabledDatepicker(false)
(@$ "#manul_date").show()
return
@@ -420,9 +419,11 @@ API.View.EditAssetView = class EditAssetView extends Backbone.View
setLoopDateTime: (start_date, end_date) =>
@$fv "start_date_date", start_date.date()
(@$f "start_date_date").datepicker autoclose: yes, format: date_settings.datepicker_format
(@$f "start_date_date").datepicker 'setDate', new Date(start_date.date())
@$fv "start_date_time", start_date.time()
@$fv "end_date_date", end_date.date()
(@$f "end_date_date").datepicker autoclose: yes, format: date_settings.datepicker_format
(@$f "end_date_date").datepicker 'setDate', new Date(end_date.date())
@$fv "end_date_time", end_date.time()

9
static/js/screenly-ose.js
View File

@@ -619,7 +619,6 @@
this.setLoopDateTime(date_to(current_date), date_to(end_date.setFullYear(9999)));
break;
case "manual":
this.setLoopDateTime(date_to(current_date), date_to(end_date.setDate(current_date.getDate() + 30)));
this.setDisabledDatepicker(false);
(this.$("#manul_date")).show();
return;
@@ -754,9 +753,17 @@
EditAssetView.prototype.setLoopDateTime = function(start_date, end_date) {
this.$fv("start_date_date", start_date.date());
(this.$f("start_date_date")).datepicker({
autoclose: true,
format: date_settings.datepicker_format
});
(this.$f("start_date_date")).datepicker('setDate', new Date(start_date.date()));
this.$fv("start_date_time", start_date.time());
this.$fv("end_date_date", end_date.date());
(this.$f("end_date_date")).datepicker({
autoclose: true,
format: date_settings.datepicker_format
});
(this.$f("end_date_date")).datepicker('setDate', new Date(end_date.date()));
this.$fv("end_date_time", end_date.time());
(this.$(".form-group .help-inline.invalid-feedback")).remove();