diff --git a/app/assets/javascripts/discourse/app/components/future-date-input.js b/app/assets/javascripts/discourse/app/components/future-date-input.js index 3f17a595ec1..1367267b482 100644 --- a/app/assets/javascripts/discourse/app/components/future-date-input.js +++ b/app/assets/javascripts/discourse/app/components/future-date-input.js @@ -79,7 +79,6 @@ export default Component.extend({ now, day: now.day(), includeWeekend: this.includeWeekend, - includeMidFuture: this.includeMidFuture || true, includeFarFuture: this.includeFarFuture, includeDateTime: this.includeDateTime, canScheduleNow: this.includeNow || false, diff --git a/app/assets/javascripts/discourse/app/lib/timeframes-builder.js b/app/assets/javascripts/discourse/app/lib/timeframes-builder.js index cdfd0a3d2bd..361ad2e336c 100644 --- a/app/assets/javascripts/discourse/app/lib/timeframes-builder.js +++ b/app/assets/javascripts/discourse/app/lib/timeframes-builder.js @@ -68,7 +68,7 @@ const TIMEFRAMES = [ buildTimeframe({ id: "two_months", format: "MMM D", - enabled: (opts) => opts.includeMidFuture, + enabled: () => true, when: (time, timeOfDay) => time.add(2, "month").startOf("month").hour(timeOfDay).minute(0), icon: "briefcase", @@ -76,7 +76,7 @@ const TIMEFRAMES = [ buildTimeframe({ id: "three_months", format: "MMM D", - enabled: (opts) => opts.includeMidFuture, + enabled: () => true, when: (time, timeOfDay) => time.add(3, "month").startOf("month").hour(timeOfDay).minute(0), icon: "briefcase", @@ -84,7 +84,7 @@ const TIMEFRAMES = [ buildTimeframe({ id: "four_months", format: "MMM D", - enabled: (opts) => opts.includeMidFuture, + enabled: () => true, when: (time, timeOfDay) => time.add(4, "month").startOf("month").hour(timeOfDay).minute(0), icon: "briefcase", @@ -92,7 +92,7 @@ const TIMEFRAMES = [ buildTimeframe({ id: "six_months", format: "MMM D", - enabled: (opts) => opts.includeMidFuture, + enabled: () => true, when: (time, timeOfDay) => time.add(6, "month").startOf("month").hour(timeOfDay).minute(0), icon: "briefcase", diff --git a/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs index 5f3ee328b67..852c3915a23 100644 --- a/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs @@ -9,7 +9,6 @@ includeDateTime=includeDateTime includeWeekend=includeWeekend includeFarFuture=includeFarFuture - includeMidFuture=includeMidFuture includeNow=includeNow clearable=clearable onChangeInput=onChangeInput diff --git a/app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs index 75bbb20e4a0..8e5858a1bc5 100644 --- a/app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs @@ -35,7 +35,6 @@ {{future-date-input includeDateTime=true - includeMidFuture=true clearable=true onChangeInput=(action (mut inviteExpiresAt)) }} diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs index 5acc3dfa1f0..c5a854dd01e 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs @@ -124,7 +124,6 @@ displayLabel=(i18n "user.invited.invite.expires_at") statusType="close" includeDateTime=true - includeMidFuture=true clearable=true input=buffered.expires_at onChangeInput=(action (mut buffered.expires_at)) diff --git a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs index 84bef934e39..2cebb1831ab 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs @@ -15,7 +15,6 @@ input=(readonly ignoredUntil) includeWeekend=true includeDateTime=false - includeMidFuture=true includeFarFuture=true onChangeInput=(action (mut ignoredUntil)) }} diff --git a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs index 8cb1e0baa88..cabbb66960a 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs @@ -4,7 +4,6 @@ input=ignoredUntil includeWeekend=true includeDateTime=false - includeMidFuture=true includeFarFuture=true onChangeInput=(action (mut ignoredUntil)) }} diff --git a/app/assets/javascripts/discourse/tests/unit/lib/timeframes-builder-test.js b/app/assets/javascripts/discourse/tests/unit/lib/timeframes-builder-test.js index 2d429fb563c..06208789681 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/timeframes-builder-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/timeframes-builder-test.js @@ -4,7 +4,6 @@ import buildTimeframes from "discourse/lib/timeframes-builder"; const DEFAULT_OPTIONS = { includeWeekend: null, - includeMidFuture: true, includeFarFuture: null, includeDateTime: null, canScheduleNow: false, diff --git a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js index 7263a27ca0b..9806006ad76 100644 --- a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js +++ b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js @@ -29,7 +29,6 @@ export default ComboBoxComponent.extend(DatetimeMixin, { now, day: now.day(), includeWeekend: this.includeWeekend, - includeMidFuture: this.includeMidFuture || true, includeFarFuture: this.includeFarFuture, includeDateTime: this.includeDateTime, canScheduleNow: this.includeNow || false, diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/date-time-inputs.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/date-time-inputs.hbs index cbea914449c..51cbad64f64 100644 --- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/date-time-inputs.hbs +++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/date-time-inputs.hbs @@ -22,7 +22,6 @@ {{future-date-input displayLabelIcon="far-clock" includeDateTime=true - includeMidFuture=true clearable=true }} {{/styleguide-example}}