Skip to content

Non-native uses [object Object]. Fixes #6 #9

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

Merged
rwaldron merged 1 commit into from
Jun 14, 2011
Merged

Non-native uses [object Object]. Fixes #6 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 26 additions & 18 deletions jquery.eventsource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,29 @@
pluginFns = {

public: {
close: function ( label ) {
close: function( label ) {

var cache = {};

if ( label !== "*" ) {
var tmp = {};

for ( var prop in stream.cache ) {
if ( label !== prop ) {
cache[ prop ] = stream.cache[ prop ];
}
if ( !label || label === "*" ) {
stream.cache = {};

return stream.cache;
}

for ( var prop in stream.cache ) {
if ( label !== prop ) {
tmp[ prop ] = stream.cache[ prop ];
}
}

stream.cache = cache;
stream.cache = tmp;

return stream.cache;
},
streams: function ( label ) {
streams: function( label ) {

if ( label === "*" ) {
if ( !label || label === "*" ) {
return stream.cache;
}

Expand All @@ -64,10 +67,10 @@
_private: {

// Open a host api event source
openEventSource: function ( options ) {
openEventSource: function( options ) {
var label = options.label;

stream.cache[ label ].stream.addEventListener("open", function (event) {
stream.cache[ label ].stream.addEventListener("open", function(event) {
if ( stream.cache[label] ) {

this.label = label;
Expand All @@ -76,7 +79,7 @@
}
}, false);

stream.cache[label].stream.addEventListener("message", function (event) {
stream.cache[label].stream.addEventListener("message", function(event) {

var streamData = [];

Expand All @@ -100,7 +103,7 @@
return stream.cache[label].stream;
},
// open fallback event source
openPollingSource: function ( options ) {
openPollingSource: function( options ) {
var label = options.label,
source;

Expand All @@ -110,13 +113,13 @@
type: "GET",
url: options.url,
data: options.data,
beforeSend: function () {
beforeSend: function() {
if ( stream.cache[label] ) {
this.label = label;
stream.cache[label].options.open.call( this );
}
},
success: function ( data ) {
success: function( data ) {

var tempdata,
label = options.label,
Expand Down Expand Up @@ -156,7 +159,7 @@


setTimeout(
function () {
function() {
pluginFns._private.openPollingSource.call( this, options );
},
// matches speed of host api EventSource
Expand Down Expand Up @@ -236,5 +239,10 @@
return stream.cache;
};

jQuery.each( [ "close", "streams" ], function( idx, name ) {
jQuery.eventsource[ name ] = function( arg ) {
return jQuery.eventsource( name, arg || "*" );
};
});

})(jQuery, window);
Loading