From a652d620f6e1e8d63f7cd36d8aa1ba7b1da3154d Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Fri, 7 Jun 2019 07:50:43 +0200 Subject: [PATCH] FIX: safari desktop doesnt support input[time] (#7719) This commit attempts to improve the experience by: - showing time input as disabled on any platform if date hasn't been set - showing a placeholder --:-- to emphasize the expected format --- .../javascripts/discourse/components/future-date-input.js.es6 | 2 ++ .../discourse/templates/components/future-date-input.hbs | 2 +- .../common/base/edit-topic-status-update-modal.scss | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/future-date-input.js.es6 b/app/assets/javascripts/discourse/components/future-date-input.js.es6 index 4efb9da149..9386c1b3f7 100644 --- a/app/assets/javascripts/discourse/components/future-date-input.js.es6 +++ b/app/assets/javascripts/discourse/components/future-date-input.js.es6 @@ -36,6 +36,8 @@ export default Ember.Component.extend({ } }, + timeInputDisabled: Ember.computed.empty("date"), + @observes("date", "time") _updateInput() { if (!this.date) { diff --git a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs index 336fabec67..d1e9bce807 100644 --- a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs +++ b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs @@ -21,7 +21,7 @@
{{d-icon "far-clock"}} - {{input type="time" value=time}} + {{input placeholder="--:--" type="time" value=time disabled=timeInputDisabled}}
{{/if}} diff --git a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss index 8a5b5c416b..09a52d20c3 100644 --- a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss +++ b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss @@ -49,6 +49,10 @@ font-size: $font-up-1; } } + + input[disabled] { + background: $primary-low; + } } .pika-single { position: absolute !important; /* inline JS styles */