From acb2d3b9cb45e73f5e35b07efbccb3d4a0b003ff Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Fri, 21 Sep 2018 11:37:18 +0600 Subject: [PATCH] fixes --- static/js/screenly-ose.coffee | 3 ++- static/js/screenly-ose.js | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/static/js/screenly-ose.coffee b/static/js/screenly-ose.coffee index 6dca2d91..92c01147 100644 --- a/static/js/screenly-ose.coffee +++ b/static/js/screenly-ose.coffee @@ -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() diff --git a/static/js/screenly-ose.js b/static/js/screenly-ose.js index 9f10ad6e..19e8422d 100644 --- a/static/js/screenly-ose.js +++ b/static/js/screenly-ose.js @@ -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();