diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-08-15 23:25:20 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-08-15 23:25:20 +0200 |
| commit | 3563eecffff7879aa87b7fc8c54b43f8e14281f0 (patch) | |
| tree | 25fbafb06ba5c4ce2f301dd92d82d30e9783ed64 /core/js/eventsource.js | |
| parent | b44cab5acc1adccf36ebd18ab7f4da9caf4c7932 (diff) | |
| parent | bd1895bdf8dff07bf9dc9803ce991e39daa52acc (diff) | |
| download | nextcloud-server-3563eecffff7879aa87b7fc8c54b43f8e14281f0.tar.gz nextcloud-server-3563eecffff7879aa87b7fc8c54b43f8e14281f0.zip | |
merge master into more-whitespace
Diffstat (limited to 'core/js/eventsource.js')
| -rw-r--r-- | core/js/eventsource.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/js/eventsource.js b/core/js/eventsource.js index ce8c8387c8e..536b180bc8f 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -110,7 +110,11 @@ OC.EventSource.prototype={ this.listeners[type].push(callback); }else{ this.source.addEventListener(type,function(e){ - callback(JSON.parse(e.data)); + if (typeof e.data != 'undefined') { + callback(JSON.parse(e.data)); + } else { + callback(''); + } },false); } }else{ |