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

Disable pointer sync for alpha rollout 

(imported from commit 50a41e49e9b4a7db0b07ee7705d51c3a2abdff35)
This commit is contained in:
Zev Benjamin 2012-10-29 14:13:26 -04:00
parent e5d89cb377
commit 2723a54088
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -614,12 +614,13 @@ function get_updates() {
add_messages(data.messages, "bottom");
}
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 is disabled for now
// 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);
},

26
zephyr/views.py
View File

@ -356,15 +356,17 @@ def return_messages_immediately(request, user_profile, client_id, **kwargs):
last = int(last)
if last < 0:
return {"msg": "Invalid 'last' argument", "result": "error"}
client_pointer = request.POST.get("pointer")
# Pointer sync is disabled for now
# client_pointer = request.POST.get("pointer")
failures = request.POST.get("failures")
client_server_generation = request.POST.get("server_generation")
client_reload_pending = request.POST.get("reload_pending")
client_wants_ptr_updates = False
if client_pointer is not None:
client_pointer = int(client_pointer)
client_wants_ptr_updates = True
# Pointer sync is disabled for now
# client_wants_ptr_updates = False
# if client_pointer is not None:
# client_pointer = int(client_pointer)
# client_wants_ptr_updates = True
if failures is not None:
failures = int(failures)
if client_reload_pending is not None:
@ -373,7 +375,8 @@ def return_messages_immediately(request, user_profile, client_id, **kwargs):
messages = []
new_pointer = None
query = Message.objects.select_related().filter(usermessage__user_profile = user_profile).order_by('id')
ptr = user_profile.pointer
# Pointer sync is disabled for now
# ptr = user_profile.pointer
messages = query.filter(id__gt=last)[:400]
@ -395,11 +398,12 @@ def return_messages_immediately(request, user_profile, client_id, **kwargs):
and not client_reload_pending):
update_types.append("client_reload")
if (client_wants_ptr_updates
and str(user_profile.last_pointer_updater) != str(client_id)
and ptr != client_pointer):
new_pointer = ptr
update_types.append("pointer_update")
# Pointer sync is disabled for now
# if (client_wants_ptr_updates
# and str(user_profile.last_pointer_updater) != str(client_id)
# and ptr != client_pointer):
# new_pointer = ptr
# update_types.append("pointer_update")
if failures >= 1:
update_types.append("reset_failure_counter")