paoda
/
polyglot
mirror of https://github.com/beatriceo/polyglot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #49 from beatriceo/fixes 

fixed issue where import triggerCalleeModalEvent broke javascript in …
This commit is contained in:
Beatrice Olivera 2018-09-04 10:31:01 +01:00 committed by GitHub
parent 7922a55e14 e0995c7610
commit 482058e6bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/packs/application.js
View File

@ -40,4 +40,4 @@ const triggerCalleeModalEvent = () => {
$("#calleeModal").modal('show'); $("#calleeModal").modal('show');
} }
export { triggerCalleeModalEvent } // export { triggerCalleeModalEvent }

6
app/javascript/packs/notifications.js
View File

@ -1,5 +1,9 @@
import ActionCable from 'actioncable' 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 // create App object with key cable == new consumer
(function() { (function() {

1
app/views/pages/_contact.html.erb
View File

@ -61,4 +61,3 @@
</div> </div>
</div> </div>

2
app/views/pages/index.html.erb
View File

@ -72,7 +72,7 @@
</div> </div>
</div> </div>
<%= javascript_pack_tag 'notifications' %>
<%= javascript_pack_tag 'local_video' %> <%= javascript_pack_tag 'local_video' %>
<%= javascript_pack_tag 'notifications' %>