Commit c3581eb012e0662ada7bc305dd301e50039fa4e1

Authored by Rodrigo Souto
1 parent a9c67a1b

chat: fix merge problem

Showing 1 changed file with 0 additions and 3 deletions   Show diff stats
public/javascripts/application.js
@@ -521,9 +521,6 @@ function userDataCallback(data) { @@ -521,9 +521,6 @@ function userDataCallback(data) {
521 noosfero.user_data = data; 521 noosfero.user_data = data;
522 if (data.login) { 522 if (data.login) {
523 // logged in 523 // logged in
524 - if (data.chat_enabled) {  
525 - setInterval(function(){ jQuery.getJSON(user_data, chatOnlineUsersDataCallBack)}, 10000);  
526 - }  
527 jQuery('head').append('<meta content="authenticity_token" name="csrf-param" />'); 524 jQuery('head').append('<meta content="authenticity_token" name="csrf-param" />');
528 jQuery('head').append('<meta content="'+jQuery.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />'); 525 jQuery('head').append('<meta content="'+jQuery.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />');
529 } 526 }