From e25594cc9848805a54fe06f67feea43640168f93 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Sat, 11 Apr 2020 17:28:58 +0800
Subject: [PATCH] fix conflict

---
 app/views/admin/announcements/index.html.erb | 38 ++++++++++----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/app/views/admin/announcements/index.html.erb b/app/views/admin/announcements/index.html.erb
index 8409c52..3bacf0f 100644
--- a/app/views/admin/announcements/index.html.erb
+++ b/app/views/admin/announcements/index.html.erb
@@ -9,24 +9,26 @@
 	<%= render :partial=> "approval_modal" %>
 
 	<script type="text/javascript">
-		var modal = $("#approvalModal");
-	  $(document).on("click", ".approval_button",function(){
-	    var url = $(this).attr("href");
-			if(window.location.protocol === "https:"){
-        url = url.replace("http:","https:");
-      }
-	    modal.find("iframe").attr("src", url);
-	    modal.find("#object_id").val($(this).data("id"));
-	    modal.modal("show");
-	    return false;
-	  })
+		$(function{
+			var modal = $("#approvalModal");
+		  $(document).on("click", ".approval_button",function(){
+		    var url = $(this).attr("href");
+				if(window.location.protocol === "https:"){
+	        url = url.replace("http:","https:");
+	      }
+		    modal.find("iframe").attr("src", url);
+		    modal.find("#object_id").val($(this).data("id"));
+		    modal.modal("show");
+		    return false;
+		  })
 
-	  var params = getUrlVars();
-	  console.log(params["url"])
-	  if(typeof params["url"] != "undefined"){
-	  	modal.find("iframe").attr("src", params["url"]);
-	    modal.find("#object_id").val(params["id"]);
-	    modal.modal("show");
-	  }
+		  var params = getUrlVars();
+		  console.log(params["url"])
+		  if(typeof params["url"] != "undefined"){
+		  	modal.find("iframe").attr("src", params["url"]);
+		    modal.find("#object_id").val(params["id"]);
+		    modal.modal("show");
+		  }
+		})
 	</script>
 <% end %>
\ No newline at end of file