Merge branch 'master' into filesystem

remotes/origin/stable4
Robin Appelman 2012-01-30 23:20:47 +07:00
commit 1191b57b34
4 changed files with 14 additions and 4 deletions

@ -1,10 +1,9 @@
ownCloud gives you freedom and control over your own data.
A personal cloud which runs on your own server.
It is alpha software in development and should be treated accordingly.
http://ownCloud.org
Installation instructions: http://owncloud.org/install
Installation instructions: http://owncloud.org/support
Source code: http://gitorious.org/owncloud
Mailing list: http://mail.kde.org/mailman/listinfo/owncloud

@ -1,5 +1,4 @@
<?php
$RUNTIME_NOAPPS=true; //no need to load the apps
$RUNTIME_NOSETUPFS=true; //don't setup the fs yet
require_once '../../lib/base.php';

@ -44,8 +44,13 @@ OC.EventSource=function(src){
$('body').append(this.iframe);
this.useFallBack=true;
OC.EventSource.iframeCount++
}
//add close listener
this.listen('__internal__',function(data){
if(data=='close'){
this.close();
}
}.bind(this));
}
OC.EventSource.fallBackSources=[];
OC.EventSource.iframeCount=0;//number of fallback iframes

@ -70,4 +70,11 @@ class OC_EventSource{
echo PHP_EOL;
flush();
}
/**
* close the connection of the even source
*/
public function close(){
$this->send('__internal__','close');//server side closing can be an issue, let the client do it
}
}