master #1

Merged
lino.jorzick merged 203 commits from External/greenlight:master into master 2021-10-02 18:19:43 +00:00
3 changed files with 43 additions and 6 deletions
Showing only changes of commit a6ce974b88 - Show all commits

View File

@ -50,6 +50,9 @@ $(document).on('turbolinks:load', function(){
showDeleteRoom(this) showDeleteRoom(this)
}) })
// For keyboard users to be able to generate access code
generateAccessCodeAccessibility()
$('.selectpicker').selectpicker({ $('.selectpicker').selectpicker({
liveSearchPlaceholder: getLocalizedString('javascript.search.start') liveSearchPlaceholder: getLocalizedString('javascript.search.start')
}); });
@ -430,3 +433,35 @@ function clearRoomSearch() {
$('#room-search').val(''); $('#room-search').val('');
filterRooms() filterRooms()
} }
function generateAccessCodeAccessibility() {
// For keyboard users to be able to generate access code
$("#generate-room-access-code").keyup(function(event) {
if (event.keyCode === 13 || event.keyCode === 32) {
generateAccessCode();
}
})
// For keyboard users to be able to reset access code
$("#reset-access-code").keyup(function(event) {
if (event.keyCode === 13 || event.keyCode === 32) {
ResetAccessCode();
}
})
// For keyboard users to be able to generate access code
// for moderator
$("#generate-moderator-room-access-code").keyup(function(event) {
if (event.keyCode === 13 || event.keyCode === 32) {
generateModeratorAccessCode();
}
})
// For keyboard users to be able to reset access code
// for moderator
$("#reset-moderator-access-code").keyup(function(event) {
if (event.keyCode === 13 || event.keyCode === 32) {
ResetModeratorAccessCode();
}
})
}

View File

@ -33,24 +33,24 @@
</div> </div>
<div class="input-icon mb-2"> <div class="input-icon mb-2">
<span onclick="generateAccessCode()" class="input-icon-addon allow-icon-click cursor-pointer"> <span onclick="generateAccessCode()" class="input-icon-addon allow-icon-click cursor-pointer" id="generate-room-access-code" tabindex="0" aria-label='<%= t("modal.create_room.access_code_placeholder") %>'>
<i class="fas fa-dice"></i> <i class="fas fa-dice"></i>
</span> </span>
<%= f.label :access_code, t("modal.create_room.access_code_placeholder"), id: "create-room-access-code", class: "form-control" %> <%= f.label :access_code, t("modal.create_room.access_code_placeholder"), id: "create-room-access-code", class: "form-control", role: "log" %>
<%= f.hidden_field :access_code %> <%= f.hidden_field :access_code %>
<span onclick="ResetAccessCode()" class="input-icon-addon allow-icon-click cursor-pointer"> <span onclick="ResetAccessCode()" class="input-icon-addon allow-icon-click cursor-pointer" id="reset-access-code" tabindex="0" aria-label='<%= t("modal.create_room.reset_access_code") %>' >
<i class="far fa-trash-alt"></i> <i class="far fa-trash-alt"></i>
</span> </span>
</div> </div>
<% if moderator_code_allowed? %> <% if moderator_code_allowed? %>
<div class="input-icon mb-2"> <div class="input-icon mb-2">
<span onclick="generateModeratorAccessCode()" class="input-icon-addon allow-icon-click cursor-pointer"> <span onclick="generateModeratorAccessCode()" class="input-icon-addon allow-icon-click cursor-pointer" id="generate-moderator-room-access-code" tabindex="0" aria-label='<%= t("modal.create_room.moderator_access_code_placeholder") %>'>
<i class="fas fa-dice"></i> <i class="fas fa-dice"></i>
</span> </span>
<%= f.label :moderator_access_code, t("modal.create_room.moderator_access_code_placeholder"), id: "create-room-moderator-access-code", class: "form-control" %> <%= f.label :moderator_access_code, t("modal.create_room.moderator_access_code_placeholder"), id: "create-room-moderator-access-code", class: "form-control", role: "log" %>
<%= f.hidden_field :moderator_access_code %> <%= f.hidden_field :moderator_access_code %>
<span onclick="ResetModeratorAccessCode()" class="input-icon-addon allow-icon-click cursor-pointer"> <span onclick="ResetModeratorAccessCode()" class="input-icon-addon allow-icon-click cursor-pointer" id="reset-moderator-access-code" tabindex="0" aria-label='<%= t("modal.create_room.reset_moderator_access_code") %>'>
<i class="far fa-trash-alt"></i> <i class="far fa-trash-alt"></i>
</span> </span>
</div> </div>

View File

@ -401,7 +401,9 @@ en:
access_code: Access Code access_code: Access Code
moderator_access_code: Moderator Code moderator_access_code: Moderator Code
access_code_placeholder: Generate an optional room access code access_code_placeholder: Generate an optional room access code
reset_access_code: Reset the optional room access code
moderator_access_code_placeholder: Generate an optional code for moderators moderator_access_code_placeholder: Generate an optional code for moderators
reset_moderator_access_code: Reset the optional code for moderators
auto_join: Automatically join me into the room auto_join: Automatically join me into the room
create: Create Room create: Create Room
free_delete: You will be free to delete this room at any time. free_delete: You will be free to delete this room at any time.