Download as
Browse Code »

Commit c3581eb012e0662ada7bc305dd301e50039fa4e1

Authored by Rodrigo Souto
1 parent a9c67a1b
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

chat: fix merge problem

Showing 1 changed file with 0 additions and 3 deletions   Show diff stats
public/javascripts/application.js
  Diff comments   View file @c3581eb
@@ -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 }