diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-11-16 20:28:03 +0100 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-11-26 17:39:19 +0100 |
| commit | 440828f0f1c62cbf7ab7a51c8f83868fe331df69 (patch) | |
| tree | 72a527abd322a4a20a0d37a38603205dfef3f439 /core/js/eventsource.js | |
| parent | 5d53e0d5cebbb4ddc289ad41cf2d59d947ab6707 (diff) | |
| download | nextcloud-server-440828f0f1c62cbf7ab7a51c8f83868fe331df69.tar.gz nextcloud-server-440828f0f1c62cbf7ab7a51c8f83868fe331df69.zip | |
check whether to join url with ? or &
Diffstat (limited to 'core/js/eventsource.js')
| -rw-r--r-- | core/js/eventsource.js | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 6d5ba321f8b..4f4515f736a 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -42,7 +42,13 @@ OC.EventSource=function(src,data){ } dataStr+='requesttoken='+OC.Request.Token; if(!this.useFallBack && typeof EventSource !='undefined'){ - this.source=new EventSource(src+'&'+dataStr); + var joinChar = '&'; + if(src.indexOf('?') == -1) { + joinChar = '?'; + } + alert(src.indexOf('?')); + alert(joinChar); + this.source=new EventSource(src+joinChar+dataStr); this.source.onmessage=function(e){ for(var i=0;i<this.typelessListeners.length;i++){ this.typelessListeners[i](JSON.parse(e.data)); @@ -54,7 +60,12 @@ OC.EventSource=function(src,data){ this.iframe=$('<iframe/>'); this.iframe.attr('id',iframeId); this.iframe.hide(); - this.iframe.attr('src',src+'&fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); + + var joinChar = '&'; + if(src.indexOf('?') == -1) { + joinChar = '?'; + } + alert(src.indexOf('?')); this.iframe.attr('src',src+joinChar+'fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); $('body').append(this.iframe); this.useFallBack=true; OC.EventSource.iframeCount++ |