From e0995c7610e42c1b3a59f19152a394cac1d462c4 Mon Sep 17 00:00:00 2001
From: Beatrice Olivera <beatriceolivera1999@gmail.com>
Date: Tue, 4 Sep 2018 10:29:56 +0100
Subject: [PATCH] fixed issue where import triggerCalleeModalEvent broke
 javascript in navbar

---
 app/javascript/packs/application.js   | 2 +-
 app/javascript/packs/notifications.js | 6 +++++-
 app/views/pages/_contact.html.erb     | 1 -
 app/views/pages/index.html.erb        | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 15bc1ae..ddc70ae 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -40,4 +40,4 @@ const triggerCalleeModalEvent = () => {
   $("#calleeModal").modal('show');
 }
 
-export { triggerCalleeModalEvent }
+// export { triggerCalleeModalEvent }
diff --git a/app/javascript/packs/notifications.js b/app/javascript/packs/notifications.js
index 09e1d7d..76d6278 100644
--- a/app/javascript/packs/notifications.js
+++ b/app/javascript/packs/notifications.js
@@ -1,5 +1,9 @@
 import ActionCable from 'actioncable'
-import { triggerCalleeModalEvent } from "./application.js";
+// import { triggerCalleeModalEvent } from "./application";
+
+const triggerCalleeModalEvent = () => {
+  $("#calleeModal").modal('show');
+}
 
 // create App object with key cable == new consumer
 (function() {
diff --git a/app/views/pages/_contact.html.erb b/app/views/pages/_contact.html.erb
index 8735455..e95836c 100644
--- a/app/views/pages/_contact.html.erb
+++ b/app/views/pages/_contact.html.erb
@@ -61,4 +61,3 @@
   </div>
 </div>
 
-
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
index b5eb6d9..a2c6858 100644
--- a/app/views/pages/index.html.erb
+++ b/app/views/pages/index.html.erb
@@ -72,7 +72,7 @@
   </div>
 </div>
 
-<%= javascript_pack_tag 'notifications' %>
 <%= javascript_pack_tag 'local_video' %>
+<%= javascript_pack_tag 'notifications' %>