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

GRN-88: Fixed some things that Scrutinizer was complaining about (#433)

Browse Source 
* Scrutinizer fixes

* Moved helper code to concern

* Another scrutinizer fix

* User controller conflict fix

* Another user controller fix

* Added include verifier
This commit is contained in:
farhatahmad
2019-04-11 10:25:49 -04:00
committed by Jesus Federico
parent 5e3aa72955
commit 88776eaadb
6 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/rename.js
View File

@ -145,7 +145,6 @@ $(document).on('turbolinks:load', function(){
// Elements that can be renamed
var room_title = $('#room-title');
var room_blocks = $('#room_block_container').find('a');
var recording_rows = $('#recording-table').find('tr');
// Configure renaming for room header

10
app/assets/javascripts/room.js
View File

@ -62,13 +62,13 @@ $(document).on('turbolinks:load', function(){
//show all elements & their children with a create-only class
$(".create-only").each(function() {
$(this).show()
if($(this).children().length > 0) $(this).children().show()
if($(this).children().length > 0) { $(this).children().show() }
})
//hide all elements & their children with a update-only class
$(".update-only").each(function() {
$(this).attr('style',"display:none !important")
if($(this).children().length > 0) $(this).children().attr('style',"display:none !important")
if($(this).children().length > 0) { $(this).children().attr('style',"display:none !important") }
})
})
@ -81,13 +81,13 @@ $(document).on('turbolinks:load', function(){
//show all elements & their children with a update-only class
$(".update-only").each(function() {
$(this).show()
if($(this).children().length > 0) $(this).children().show()
if($(this).children().length > 0) { $(this).children().show() }
})
//hide all elements & their children with a create-only class
$(".create-only").each(function() {
$(this).attr('style',"display:none !important")
if($(this).children().length > 0) $(this).children().attr('style',"display:none !important")
if($(this).children().length > 0) { $(this).children().attr('style',"display:none !important") }
})
updateCurrentSettings($(this).closest("#room-block").data("room-settings"))
@ -105,7 +105,7 @@ $(document).on('turbolinks:load', function(){
//set dropdown value
if (settings.joinViaHtml5) {
updateDropdown($(".dropdown-item[value='html5']"))
} else if (settings.joinViaHtml5 == false) {
} else if (settings.joinViaHtml5 === false) {
updateDropdown($(".dropdown-item[value='flash']"))
} else { //default option
updateDropdown($(".dropdown-item[value='default']"))

2
app/assets/javascripts/sort.js
View File

@ -92,6 +92,8 @@ $(document).on('turbolinks:load', function(){
}
else if(order === "desc"){
return b_val.localeCompare(a_val);
} else {
return undefined;
}