[Pkg-owncloud-commits] [owncloud] 146/394: all but the first parameter are introduced by &
David Prévot
taffit at alioth.debian.org
Fri Nov 8 23:11:49 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.
commit 5d53e0d5cebbb4ddc289ad41cf2d59d947ab6707
Author: Arthur Schiwon <blizzz at owncloud.com>
Date: Thu Nov 15 18:26:08 2012 +0100
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 609d78e..b577156 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -211,7 +211,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({
@@ -891,7 +891,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 45c6371..6d5ba32 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.typelessListeners.length;i++){
this.typelessListeners[i](JSON.parse(e.data));
@@ -54,7 +54,7 @@ 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);
+ 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]){
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list