Improve code quality to increase scrut score (#789)

app/assets/javascripts/main.js

@@ -33,7 +33,7 @@ function getLocalizedString(key) {
   })
 
   // If key is not found, search the fallback language for the key
-  if (translated == undefined) { 
+  if (translated === undefined) { 
     translated = I18nFallback
 
     keyArr.forEach(function(k) {

app/assets/javascripts/room.js

@@ -44,10 +44,20 @@ $(document).on('turbolinks:load', function(){
     if ($("#cant-create-room-wrapper").length){
       $(".wrapper").css('height', '100%').css('height', '-=130px');
     }
-  }
 
     // Display and update all fields related to creating a room in the createRoomModal
     $("#create-room-block").click(function(){
+      showCreateRoom()
+    })
+
+    // Display and update all fields related to creating a room in the createRoomModal
+    $(".update-room").click(function(){
+      showUpdateRoom()
+    })
+  }
+});
+
+function showCreateRoom() {
   $("#create-room-name").val("")
   $("#create-room-access-code").text(getLocalizedString("modal.create_room.access_code_placeholder"))
   $("#room_access_code").val(null)
@@ -69,10 +79,9 @@ $(document).on('turbolinks:load', function(){
     $(this).attr('style',"display:none !important")
     if($(this).children().length > 0) { $(this).children().attr('style',"display:none !important") }
   })
-  })
+}
 
-  // Display and update all fields related to creating a room in the createRoomModal
-  $(".update-room").click(function(){
+function showUpdateRoom() {
   var room_block_uid = $(this).closest("#room-block").data("room-uid")
   $("#create-room-name").val($(this).closest("tbody").find("#room-name h4").text())
   $("#createRoomModal form").attr("action", room_block_uid + "/update_settings")
@@ -91,7 +100,7 @@ $(document).on('turbolinks:load', function(){
 
   updateCurrentSettings($(this).closest("#room-block").data("room-settings"))
   
-    accessCode = $(this).closest("#room-block").data("room-access-code")
+  var accessCode = $(this).closest("#room-block").data("room-access-code")
 
   if(accessCode){
     $("#create-room-access-code").text(getLocalizedString("modal.create_room.access_code") + ": " + accessCode)
@@ -100,37 +109,17 @@ $(document).on('turbolinks:load', function(){
     $("#create-room-access-code").text(getLocalizedString("modal.create_room.access_code_placeholder"))
     $("#room_access_code").val(null)
   }
-  })
+}
 
 //Update the createRoomModal to show the correct current settings
 function updateCurrentSettings(settings){
   //set checkbox
-    if(settings.muteOnStart){
-      $("#room_mute_on_join").prop("checked", true)
-    } else { //default option
-      $("#room_mute_on_join").prop("checked", false)
+  $("#room_mute_on_join").prop("checked", settings.muteOnStart)
+  $("#room_require_moderator_approval").prop("checked", settings.requireModeratorApproval)
+  $("#room_anyone_can_start").prop("checked", settings.anyoneCanStart)
+  $("#room_all_join_moderator").prop("checked", settings.joinModerator)
 }
 
-    if(settings.requireModeratorApproval){
-      $("#room_require_moderator_approval").prop("checked", true)
-    } else { //default option
-      $("#room_require_moderator_approval").prop("checked", false)
-    }
-    
-    if(settings.anyoneCanStart){
-      $("#room_anyone_can_start").prop("checked", true)
-    } else { //default option
-      $("#room_anyone_can_start").prop("checked", false)
-    }
-
-    if(settings.joinModerator){
-      $("#room_all_join_moderator").prop("checked", true)
-    } else { //default option
-      $("#room_all_join_moderator").prop("checked", false)
-    }
-  }
-});
-
 function generateAccessCode(){
   const accessCodeLength = 6
   var validCharacters = "0123456789"

app/controllers/rooms_controller.rb

@@ -141,7 +141,7 @@ class RoomsController < ApplicationController
 
     # Include the user's choices for the room settings
     room_settings = JSON.parse(@room[:room_settings])
-    opts[:mute_on_start] = room_settings["muteOnStart"] if room_settings["muteOnStart"]
+    opts[:mute_on_start] = room_settings["muteOnStart"]
     opts[:require_moderator_approval] = room_settings["requireModeratorApproval"]
 
     begin
@@ -164,14 +164,14 @@ class RoomsController < ApplicationController
       raise "Room name can't be blank" if options[:name].blank?
       raise "Unauthorized Request" if !@room.owned_by?(current_user) || @room == current_user.main_room
 
-      # Update the rooms settings
+      # Update the rooms values
       room_settings_string = create_room_settings_string(options)
-      @room.update_attributes(room_settings: room_settings_string) if @room.room_settings != room_settings_string
 
-      # Update the rooms name if it has been changed
-      @room.update_attributes(name: options[:name]) if @room.name != options[:name]
-      # Update the room's access code if it has changed
-      @room.update_attributes(access_code: options[:access_code]) if @room.access_code != options[:access_code]
+      @room.update_attributes(
+        name: options[:name],
+        room_settings: room_settings_string,
+        access_code: options[:access_code]
+      )
 
       flash[:success] = I18n.t("room.update_settings_success")
     rescue => e
@@ -202,14 +202,12 @@ class RoomsController < ApplicationController
   private
 
   def create_room_settings_string(options)
-    room_settings = {}
-    room_settings["muteOnStart"] = options[:mute_on_join] == "1"
-
-    room_settings["requireModeratorApproval"] = options[:require_moderator_approval] == "1"
-
-    room_settings["anyoneCanStart"] = options[:anyone_can_start] == "1"
-
-    room_settings["joinModerator"] = options[:all_join_moderator] == "1"
+    room_settings = {
+      "muteOnStart": options[:mute_on_join] == "1",
+      "requireModeratorApproval": options[:require_moderator_approval] == "1",
+      "anyoneCanStart": options[:anyone_can_start] == "1",
+      "joinModerator": options[:all_join_moderator] == "1",
+    }
 
     room_settings.to_json
   end