Skip to content

Fixes for issue #16 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for issue #16 #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3840fc3
Refactore the code to poll again into a separate method and add an er…
izabellagal Sep 19, 2013
ab4b0f8
In the fall-back implementation get the lastEventId value from the pa…
izabellagal Sep 19, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions jquery.eventsource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,15 @@

if ( stream.cache[ label ] ) {

var headers = {};
if (stream.cache[ label ].lastEventId)
headers['Last-Event-ID'] = stream.cache[ label ].lastEventId;

source = jQuery.ajax({
type: "GET",
url: options.url,
data: options.data,
headers: headers,
beforeSend: function() {
if ( stream.cache[ label ] ) {
this.label = label;
Expand Down Expand Up @@ -174,27 +179,40 @@

this.label = label;

stream.cache[ label ].lastEventId++;
stream.cache[ label ].history[ stream.cache[ label ].lastEventId ] = parsedData;
if (parsedData[0]) {
stream.cache[ label ].lastEventId = parsedData[0].id;
stream.cache[ label ].history[ stream.cache[ label ].lastEventId ] = parsedData;
}

stream.cache[ label ].options.message.call(this, parsedData[0] ? parsedData[0] : null, {
data: parsedData,
lastEventId: stream.cache[ label ].lastEventId
});

setTimeout(
function() {
pluginFns._private.openPollingSource.call( this, options );
},
// Use server sent retry time if exists or default retry time if not
( stream.cache[ label ] && stream.cache[ label ].retry ) || 500
);
pluginFns._private.pollAgain(options);
}
},
error: function() {
pluginFns._private.pollAgain(options);
},
cache: false,
timeout: 50000
});
}
return source;
},
pollAgain: function (options) {
var label = options.label;
if (stream.cache[ label ].timer)
clearInterval(stream.cache[ label ].timer);

stream.cache[ label ].timer = setTimeout(
function() {
pluginFns._private.openPollingSource( options );
},
// Use server sent retry time if exists or default retry time if not
( stream.cache[ label ] && stream.cache[ label ].retry ) || 500
);
}
}
},
Expand Down