DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into staging

Browse source
This commit is contained in:
Xavier J 2017-01-02 10:25:57 +01:00
commit 64e4d34b5a
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/cable.js
View file

@ -5,9 +5,9 @@
//= require_self //= require_self
//= require_tree ./channels //= require_tree ./channels
(function() { //(function() {
this.App || (this.App = {}); // this.App || (this.App = {});
//
App.cable = ActionCable.createConsumer(); // App.cable = ActionCable.createConsumer();
//
}).call(this); //}).call(this);

18
app/assets/javascripts/channels/notifications.js
View file

@ -1,12 +1,12 @@
App.messages = App.cable.subscriptions.create('NotificationsChannel', { //App.messages = App.cable.subscriptions.create('NotificationsChannel', {
received: function (data) { // received: function (data) {
if (window.location.href.indexOf('backoffice') !== -1) { // if (window.location.href.indexOf('backoffice') !== -1) {
$("#notification_alert").html(data['message']); // $("#notification_alert").html(data['message']);
//
slideIn_notification_alert(); // slideIn_notification_alert();
} // }
} // }
}); //});
function slideIn_notification_alert (){ function slideIn_notification_alert (){
$("#notification_alert").animate({ $("#notification_alert").animate({