diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-03-31 16:40:42 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-03-31 16:40:42 +0200 |
| commit | 2f68b084919437013cc6d977c0f077e541cf83f9 (patch) | |
| tree | 6ecbce61d781a53a844842f4c499c43837183c44 | |
| parent | ebc7a6a0a6249213122bf97104f850d2ce6b7c1a (diff) | |
| download | nextcloud-server-2f68b084919437013cc6d977c0f077e541cf83f9.tar.gz nextcloud-server-2f68b084919437013cc6d977c0f077e541cf83f9.zip | |
fix eventsource for ie
| -rw-r--r-- | core/js/eventsource.js | 2 | ||||
| -rw-r--r-- | lib/eventsource.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 34bce60c24a..08259e02cae 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -68,7 +68,7 @@ OC.EventSource=function(src,data){ OC.EventSource.fallBackSources=[]; OC.EventSource.iframeCount=0;//number of fallback iframes OC.EventSource.fallBackCallBack=function(id,type,data){ - OC.EventSource.fallBackSources[id].fallBackCallBack(type,JSON.parse(data)); + OC.EventSource.fallBackSources[id].fallBackCallBack(type,data); } OC.EventSource.prototype={ typelessListeners:[], diff --git a/lib/eventsource.php b/lib/eventsource.php index dc28616c2dd..cf10660b94c 100644 --- a/lib/eventsource.php +++ b/lib/eventsource.php @@ -59,7 +59,7 @@ class OC_EventSource{ $type=null; } if($this->fallback){ - $response='<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('.$this->fallBackId.',"'.$type.'","'.json_encode($data).'")</script>'.PHP_EOL; + $response='<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('.$this->fallBackId.',"'.$type.'",'.json_encode($data).')</script>'.PHP_EOL; echo $response; }else{ if($type){ |