paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up obsolete fields in get_events_params.

Browse Source 
Both pointer and last are fields that were removed when we changed the
protocol to use events like a year ago.

This conveniently allows us to stop exporting get_updates_params to
other modules.

(imported from commit 13651ee240ce6e1bafb241b185e5ef653c348cdf)
This commit is contained in:
Tim Abbott
2014-01-30 15:01:52 -05:00
parent 2fb9baafb4
commit d0ae8795c3
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
static/js/server_events.js
View File

@@ -10,11 +10,7 @@ var events_stored_while_loading = [];
var get_events_xhr;
var get_events_timeout;
var get_events_failures = 0;
exports.get_events_params = {
pointer: -1
};
var get_events_params = {};
function get_events_success(events) {
var messages = [];
@@ -22,8 +18,8 @@ function get_events_success(events) {
var new_pointer;
_.each(events, function (event) {
exports.get_events_params.last_event_id = Math.max(exports.get_events_params.last_event_id,
event.id);
get_events_params.last_event_id = Math.max(get_events_params.last_event_id,
event.id);
});
if (tutorial.is_running()) {
@@ -177,11 +173,10 @@ function get_events_success(events) {
function get_events(options) {
options = _.extend({dont_block: false}, options);
exports.get_events_params.pointer = furthest_read;
exports.get_events_params.dont_block = options.dont_block || get_events_failures > 0;
if (exports.get_events_params.queue_id === undefined) {
exports.get_events_params.queue_id = page_params.event_queue_id;
exports.get_events_params.last_event_id = page_params.last_event_id;
get_events_params.dont_block = options.dont_block || get_events_failures > 0;
if (get_events_params.queue_id === undefined) {
get_events_params.queue_id = page_params.event_queue_id;
get_events_params.last_event_id = page_params.last_event_id;
}
if (get_events_xhr !== undefined) {
@@ -193,7 +188,7 @@ function get_events(options) {
get_events_timeout = undefined;
get_events_xhr = channel.post({
url: '/json/get_events',
data: exports.get_events_params,
data: get_events_params,
idempotent: true,
timeout: page_params.poll_timeout,
success: function (data) {

4
static/js/zulip.js
View File

@@ -640,7 +640,6 @@ function add_message_metadata(message) {
}
return cached_msg;
}
server_events.get_events_params.last = Math.max(server_events.get_events_params.last || 0, message.id);
var involved_people;
@@ -1212,9 +1211,6 @@ function main() {
if (furthest_read === old_id) {
furthest_read = new_id;
}
if (server_events.get_events_params.pointer === old_id) {
server_events.get_events_params.pointer = new_id;
}
if (msg_metadata_cache[old_id]) {
msg_metadata_cache[new_id] = msg_metadata_cache[old_id];
delete msg_metadata_cache[old_id];