Skip to content

Commit

Permalink
Merge pull request #13932 from nextcloud/backport/13931/stable30
Browse files Browse the repository at this point in the history
  • Loading branch information
Antreesy authored Dec 4, 2024
2 parents 0fab99a + 5898dd3 commit 45c1792
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
13 changes: 7 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 6 additions & 7 deletions src/components/ConversationSettings/LobbySettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,18 @@
</div>
<NcDateTimePicker id="moderation_settings_lobby_timer_field"
aria-describedby="moderation_settings_lobby_timer_hint"
:value="lobbyTimer"
:model-value="lobbyTimer"
:default-value="defaultLobbyTimer"
:placeholder="t('spreed', 'Start time (optional)')"
:disabled="lobbyTimerFieldDisabled"
type="datetime"
value-type="timestamp"
format="YYYY-MM-DD HH:mm"
:minute-step="5"
:input-class="['mx-input', { focusable: !lobbyTimerFieldDisabled }]"
v-bind="dateTimePickerAttrs"
confirm
clearable
@change="saveLobbyTimer" />
<div class="lobby_timer--timezone">
{{ getTimeZone }}
Expand Down Expand Up @@ -152,17 +157,11 @@ export default {

dateTimePickerAttrs() {
return {
format: 'YYYY-MM-DD HH:mm',
firstDayOfWeek: window.firstDay + 1, // Provided by server
lang: {
days: window.dayNamesShort, // Provided by server
months: window.monthNamesShort, // Provided by server
},
confirm: true,
clearable: true,
minuteStep: 5,
appendToBody: true,
valueType: 'timestamp',
}
},

Expand Down

0 comments on commit 45c1792

Please sign in to comment.