diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-01-31 17:03:48 +0100 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-01-31 17:03:48 +0100 |
| commit | f91702d7b5973955b9be074e8c864be8c8a29c25 (patch) | |
| tree | 2e495ea9f603e096ff8a61fbbcb22458955a4092 /core | |
| parent | c72c4dd41282c23f5c4ea2a9c3a7cbe2876f894b (diff) | |
| parent | fdf3df3de591845df5255b04eabe12e794faa1f1 (diff) | |
| download | nextcloud-server-f91702d7b5973955b9be074e8c864be8c8a29c25.tar.gz nextcloud-server-f91702d7b5973955b9be074e8c864be8c8a29c25.zip | |
Merge branch 'master' into calendar
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/eventsource.js | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 30b942f59e8..dece1a69d04 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -26,9 +26,18 @@ * use server side events with causion, to many open requests can hang the server */ -OC.EventSource=function(src){ +/** + * create a new event source + * @param string src + * @param object data to be send as GET + */ +OC.EventSource=function(src,data){ + var dataStr=''; + for(name in data){ + dataStr+=name+'='+encodeURIComponent(data[name])+'&'; + } if(!this.useFallBack && typeof EventSource !='undefined'){ - this.source=new EventSource(src); + this.source=new EventSource(src+'?'+dataStr); this.source.onmessage=function(e){ for(var i=0;i<this.typelessListeners.length;i++){ this.typelessListeners[i](JSON.parse(e.data)); @@ -40,7 +49,7 @@ OC.EventSource=function(src){ this.iframe=$('<iframe/>'); this.iframe.attr('id',iframeId); this.iframe.hide(); - this.iframe.attr('src',src+'?fallback=true&fallback_id='+OC.EventSource.iframeCount); + this.iframe.attr('src',src+'?fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); $('body').append(this.iframe); this.useFallBack=true; OC.EventSource.iframeCount++ |