Download as
Browse Code »

Commit 5ffb864f05d31a6d5d3a8fe7da2a7fa9f9c42d21

Authored by Victor Costa
Committed by Rodrigo Souto
1 parent 7212de73
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Remove userdata polling when chat is enabled

Showing 1 changed file with 0 additions and 30 deletions   Show diff stats
public/javascripts/application.js
  Diff comments   View file @5ffb864
@@ -517,10 +517,6 @@ jQuery(function($) { @@ -517,10 +517,6 @@ jQuery(function($) {
517 517
518 $.getJSON('/account/user_data', function userDataCallBack(data) { 518 $.getJSON('/account/user_data', function userDataCallBack(data) {
519 if (data.login) { 519 if (data.login) {
520 - // logged in  
521 - if (data.chat_enabled) {  
522 - setInterval(function(){ $.getJSON('/account/user_data', chatOnlineUsersDataCallBack)}, 10000);  
523 - }  
524 $('head').append('<meta content="authenticity_token" name="csrf-param" />'); 520 $('head').append('<meta content="authenticity_token" name="csrf-param" />');
525 $('head').append('<meta content="'+$.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />'); 521 $('head').append('<meta content="'+$.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />');
526 } 522 }
@@ -531,32 +527,6 @@ jQuery(function($) { @@ -531,32 +527,6 @@ jQuery(function($) {
531 $(window).trigger("userDataLoaded", data); 527 $(window).trigger("userDataLoaded", data);
532 }); 528 });
533 529
534 - function chatOnlineUsersDataCallBack(data) {  
535 - if ($('#chat-online-users').length == 0) {  
536 - return;  
537 - }  
538 - var content = '';  
539 - $('#chat-online-users .amount_of_friends').html(data['amount_of_friends']);  
540 - $('#chat-online-users').fadeIn();  
541 - for (var user in data['friends_list']) {  
542 - var name = "<span class='friend_name'>%{name}</span>";  
543 - var avatar = data['friends_list'][user]['avatar'];  
544 - var jid = data['friends_list'][user]['jid'];  
545 - var status_name = data['friends_list'][user]['status'] || 'offline';  
546 - avatar = avatar ? '<img src="' + avatar + '" />' : ''  
547 - name = name.replace('%{name}',data['friends_list'][user]['name']);  
548 - open_chat_link = "onclick='open_chat_window(this, \"#" + jid + "\")'";  
549 - var status_icon = "<div class='chat-online-user-status icon-menu-"+ status_name + "-11'><span>" + status_name + '</span></div>';  
550 - content += "<li><a href='#' class='chat-online-user' " + open_chat_link + "><div class='chat-online-user-avatar'>" + avatar + '</div>' + name + status_icon + '</a></li>';  
551 - }  
552 - content ? $('#chat-online-users-hidden-content ul').html(content) : $('#anyone-online').show();  
553 - $('#chat-online-users-title').click(function(){  
554 - if($('#chat-online-users-content').is(':visible'))  
555 - $('#chat-online-users-content').hide();  
556 - else  
557 - $('#chat-online-users-content').show();  
558 - });  
559 - }  
560 }); 530 });
561 531
562 // controls the display of contact list 532 // controls the display of contact list