Download as
Browse Code »

Commit 607decd29775f87bbc6576671571f0bff5227a07

Authored by Rodrigo Souto
1 parent 032a2ee6
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

Add default value for offset

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
public/javascripts/chat.js
  Diff comments   View file @607decd
@@ -117,6 +117,7 @@ jQuery(function($) { @@ -117,6 +117,7 @@ jQuery(function($) {
117 }, 117 },
118 118
119 show_message: function (jid, name, body, who, identifier, time, offset) { 119 show_message: function (jid, name, body, who, identifier, time, offset) {
  120 + if(!offset) offset = 0;
120 if (body) { 121 if (body) {
121 body = Jabber.render_body_message(body); 122 body = Jabber.render_body_message(body);
122 var jid_id = Jabber.jid_to_id(jid); 123 var jid_id = Jabber.jid_to_id(jid);
@@ -124,7 +125,7 @@ jQuery(function($) { @@ -124,7 +125,7 @@ jQuery(function($) {
124 var history = $(tab_id).find('.history'); 125 var history = $(tab_id).find('.history');
125 126
126 var offset_container = $('#chat-offset-container-'+offset); 127 var offset_container = $('#chat-offset-container-'+offset);
127 - if(offset_container.length == 0) 128 + if(offset_container.length == 0)
128 offset_container = $('<div id="chat-offset-container-'+offset+'"></div>').prependTo(history); 129 offset_container = $('<div id="chat-offset-container-'+offset+'"></div>').prependTo(history);
129 130
130 if (offset_container.find('.message:last').attr('data-who') == who) { 131 if (offset_container.find('.message:last').attr('data-who') == who) {