Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Temporarily disable pointer sync 

(imported from commit 74e6bb347e0b8c01b6450914a50448b78b9749c9)
This commit is contained in:
Zev Benjamin 2012-10-23 15:23:54 -04:00
parent c5f262987f
commit ce3ea9f019
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zephyr/static/js/zephyr.js
View File

@ -674,12 +674,13 @@ function get_updates() {
add_messages(data);
}
if (data.new_pointer !== undefined
&& data.new_pointer !== selected_message_id)
{
select_message_by_id(data.new_pointer,
{then_scroll: true, update_server: false});
}
// Pointer sync temporarily disabled
// if (data.new_pointer !== undefined
// && data.new_pointer !== selected_message_id)
// {
// select_message_by_id(data.new_pointer,
// {then_scroll: true, update_server: false});
// }
get_updates_timeout = setTimeout(get_updates, 0);
},

13
zephyr/views.py
View File

@ -329,12 +329,13 @@ def return_messages_immediately(request, handler, user_profile, **kwargs):
and not client_reload_pending):
# Inform the client that they should reload.
reason_empty = 'client_reload'
elif (client_pointer is not None
and str(user_profile.last_pointer_updater) != str(request.session.session_key)
and ptr != client_pointer
and str(user_profile.last_pointer_updater) != ''):
reason_empty = 'pointer_update'
new_pointer = ptr
# Pointer update temporarily disabled
# elif (client_pointer is not None
# and str(user_profile.last_pointer_updater) != str(request.session.session_key)
# and ptr != client_pointer
# and str(user_profile.last_pointer_updater) != ''):
# reason_empty = 'pointer_update'
# new_pointer = ptr
if reason_empty is not None:
handler.finish(format_updates_response(