From f9c5a0fd4dca999715deb2e1ae55bb0f7b255a67 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 15 Nov 2012 18:26:08 +0100 Subject: [PATCH] all but the first parameter are introduced by & --- apps/files/js/files.js | 4 ++-- core/js/eventsource.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 64919acb5dd..44332ee906d 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -199,7 +199,7 @@ $(document).ready(function() { $(document).bind('drop dragover', function (e) { e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone }); - + if ( document.getElementById("data-upload-form") ) { $(function() { $('.file_upload_start').fileupload({ @@ -863,7 +863,7 @@ function getMimeIcon(mime, ready){ if(getMimeIcon.cache[mime]){ ready(getMimeIcon.cache[mime]); }else{ - $.get( OC.filePath('files','ajax','mimeicon.php')+'?mime='+mime, function(path){ + $.get( OC.filePath('files','ajax','mimeicon.php')+'&mime='+mime, function(path){ getMimeIcon.cache[mime]=path; ready(getMimeIcon.cache[mime]); }); diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 45c63715a7e..6d5ba321f8b 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -42,7 +42,7 @@ OC.EventSource=function(src,data){ } dataStr+='requesttoken='+OC.Request.Token; if(!this.useFallBack && typeof EventSource !='undefined'){ - this.source=new EventSource(src+'?'+dataStr); + this.source=new EventSource(src+'&'+dataStr); this.source.onmessage=function(e){ for(var i=0;i'); this.iframe.attr('id',iframeId); this.iframe.hide(); - this.iframe.attr('src',src+'?fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); + this.iframe.attr('src',src+'&fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); $('body').append(this.iframe); this.useFallBack=true; OC.EventSource.iframeCount++ @@ -90,7 +90,7 @@ OC.EventSource.prototype={ lastLength:0,//for fallback listen:function(type,callback){ if(callback && callback.call){ - + if(type){ if(this.useFallBack){ if(!this.listeners[type]){