diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-01-30 23:20:47 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-01-30 23:20:47 +0100 |
| commit | 1191b57b34ef63885bd6d05aff73f71de849a707 (patch) | |
| tree | 8905ff5dfcbada471470fde0302a222dac4ff3ed | |
| parent | 4522d19b4c214676b8a0d4067c3a2d1bc63618bc (diff) | |
| parent | 6a1121ab2e91a362ed1e13e18c44fca40761f97a (diff) | |
| download | nextcloud-server-1191b57b34ef63885bd6d05aff73f71de849a707.tar.gz nextcloud-server-1191b57b34ef63885bd6d05aff73f71de849a707.zip | |
Merge branch 'master' into filesystem
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | apps/files_sharing/get.php | 1 | ||||
| -rw-r--r-- | core/js/eventsource.js | 7 | ||||
| -rw-r--r-- | lib/eventsource.php | 7 |
4 files changed, 14 insertions, 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 diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php index ca95a68c6ce..c80b0c2ef03 100644 --- a/apps/files_sharing/get.php +++ b/apps/files_sharing/get.php @@ -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'; diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 422f97657bd..30b942f59e8 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -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 diff --git a/lib/eventsource.php b/lib/eventsource.php index c123eb4b837..b0450ff3d55 100644 --- a/lib/eventsource.php +++ b/lib/eventsource.php @@ -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 + } }
\ No newline at end of file |