From 091b548e90d73b2aa2157563b5a02c1e08a3f54a Mon Sep 17 00:00:00 2001
From: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Date: Fri, 20 Sep 2019 15:33:08 -0400
Subject: [PATCH] Fixed issue with Room Settings (#807)

---
 app/assets/javascripts/room.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/room.js b/app/assets/javascripts/room.js
index d03fac8e..db16fe94 100644
--- a/app/assets/javascripts/room.js
+++ b/app/assets/javascripts/room.js
@@ -47,17 +47,18 @@ $(document).on('turbolinks:load', function(){
 
     // Display and update all fields related to creating a room in the createRoomModal
     $("#create-room-block").click(function(){
-      showCreateRoom()
+      showCreateRoom(this)
     })
 
     // Display and update all fields related to creating a room in the createRoomModal
     $(".update-room").click(function(){
-      showUpdateRoom()
+      showUpdateRoom(this)
     })
   }
 });
 
-function showCreateRoom() {
+function showCreateRoom(target) {
+  var modal = $(target)
   $("#create-room-name").val("")
   $("#create-room-access-code").text(getLocalizedString("modal.create_room.access_code_placeholder"))
   $("#room_access_code").val(null)
@@ -81,9 +82,10 @@ function showCreateRoom() {
   })
 }
 
-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())
+function showUpdateRoom(target) {
+  var modal = $(target)
+  var room_block_uid = modal.closest("#room-block").data("room-uid")
+  $("#create-room-name").val(modal.closest("tbody").find("#room-name h4").text())
   $("#createRoomModal form").attr("action", room_block_uid + "/update_settings")
 
   //show all elements & their children with a update-only class
@@ -98,9 +100,9 @@ function showUpdateRoom() {
     if($(this).children().length > 0) { $(this).children().attr('style',"display:none !important") }
   })
 
-  updateCurrentSettings($(this).closest("#room-block").data("room-settings"))
+  updateCurrentSettings(modal.closest("#room-block").data("room-settings"))
   
-  var accessCode = $(this).closest("#room-block").data("room-access-code")
+  var accessCode = modal.closest("#room-block").data("room-access-code")
 
   if(accessCode){
     $("#create-room-access-code").text(getLocalizedString("modal.create_room.access_code") + ": " + accessCode)