lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-206: Remove support for the flash client Fixes(#654) (#661)

Browse Source 
* Remove ability to specify flash client

* Always join via html5

* Fix styling and tests
This commit is contained in:
shawn-higgins1
2019-07-24 09:37:59 -04:00
committed by Jesus Federico
parent 4e31366012
commit 0934919e44
8 changed files with 14 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/room.js.erb
View File

@ -48,7 +48,6 @@ $(document).on('turbolinks:load', function(){
$("#room_access_code").val(null)
$("#createRoomModal form").attr("action", $("body").data('relative-root'))
updateDropdown($(".dropdown-item[value='default']"))
$("#room_mute_on_join").prop("checked", false)
$("#room_require_moderator_approval").prop("checked", false)
$("#room_anyone_can_start").prop("checked", false)
@ -117,24 +116,9 @@ $(document).on('turbolinks:load', function(){
} else { //default option
$("#room_anyone_can_start").prop("checked", false)
}
//set dropdown value
if (settings.joinViaHtml5) {
updateDropdown($(".dropdown-item[value='html5']"))
} else if (settings.joinViaHtml5 === false) {
updateDropdown($(".dropdown-item[value='flash']"))
} else { //default option
updateDropdown($(".dropdown-item[value='default']"))
}
}
});
// Updates the dropdown element to show the clicked/correct text
function updateDropdown(element) {
$("#dropdown-trigger").text(element.text())
$("#room_client").val(element.val())
}
function generateAccessCode(){
const accessCodeLength = 6
var validCharacters = "0123456789"