diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-07-11 03:33:47 -0700 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-07-11 03:33:47 -0700 |
| commit | c5f2ea9a9511e78d724bb1c90748f894bb8b57af (patch) | |
| tree | a7d7918ba4a2701758c1bf7c095c041dbd4d73dc /core | |
| parent | f74659f3f608cf022e320d366c0e0cd9b4b35767 (diff) | |
| parent | d18bd17eb7d13010e3daef5351d7f7ec64480fd7 (diff) | |
| download | nextcloud-server-c5f2ea9a9511e78d724bb1c90748f894bb8b57af.tar.gz nextcloud-server-c5f2ea9a9511e78d724bb1c90748f894bb8b57af.zip | |
Merge pull request #4015 from owncloud/fixing-4005-master
EventSource and update fixes [master]
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/eventsource.js | 6 | ||||
| -rw-r--r-- | core/js/update.js | 5 |
2 files changed, 9 insertions, 2 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{ diff --git a/core/js/update.js b/core/js/update.js index 8ab02bbf935..2c28e72f7cd 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -5,6 +5,9 @@ $(document).ready(function () { }); updateEventSource.listen('error', function(message) { $('<span>').addClass('error').append(message).append('<br />').appendTo($('.update')); + message = 'Please reload the page.'; + $('<span>').addClass('error').append(message).append('<br />').appendTo($('.update')); + updateEventSource.close(); }); updateEventSource.listen('failure', function(message) { $('<span>').addClass('error').append(message).append('<br />').appendTo($('.update')); @@ -20,4 +23,4 @@ $(document).ready(function () { window.location.href = OC.webroot; }, 3000); }); -});
\ No newline at end of file +}); |