mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9384 from owncloud/eventsrc-fixfallbackwhenclosed 

Fixed event source fallback after close
This commit is contained in:
Morris Jobke 2014-07-03 11:07:02 +02:00
parent e9f616b0a0 8ef8ef1096
commit b8ced7025e
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/js/eventsource.js
View File

@ -28,6 +28,8 @@
* server
*/
/* global EventSource */
/**
* Create a new event source
* @param {string} src
@ -35,7 +37,10 @@
*/
OC.EventSource=function(src,data){
var dataStr='';
var name;
var joinChar;
this.typelessListeners=[];
this.closed = false;
this.listeners={};
if(data){
for(name in data){
@ -43,25 +48,25 @@ OC.EventSource=function(src,data){
}
}
dataStr+='requesttoken='+oc_requesttoken;
if(!this.useFallBack && typeof EventSource !='undefined'){
var joinChar = '&';
if(!this.useFallBack && typeof EventSource !== 'undefined'){
joinChar = '&';
if(src.indexOf('?') === -1) {
joinChar = '?';
}
this.source=new EventSource(src+joinChar+dataStr);
this.source= new EventSource(src+joinChar+dataStr);
this.source.onmessage=function(e){
for(var i=0;i<this.typelessListeners.length;i++){
this.typelessListeners[i](JSON.parse(e.data));
}
}.bind(this);
}else{
iframeId='oc_eventsource_iframe_'+OC.EventSource.iframeCount;
var iframeId='oc_eventsource_iframe_'+OC.EventSource.iframeCount;
OC.EventSource.fallBackSources[OC.EventSource.iframeCount]=this;
this.iframe=$('<iframe/>');
this.iframe.attr('id',iframeId);
this.iframe.hide();
var joinChar = '&';
joinChar = '&';
if(src.indexOf('?') === -1) {
joinChar = '?';
}
@ -72,7 +77,7 @@ OC.EventSource=function(src,data){
}
//add close listener
this.listen('__internal__',function(data){
if(data=='close'){
if(data === 'close'){
this.close();
}
}.bind(this));
@ -88,14 +93,19 @@ OC.EventSource.prototype={
listeners:{},//only for fallback
useFallBack:false,
fallBackCallBack:function(type,data){
var i;
// ignore messages that might appear after closing
if (this.closed) {
return;
}
if(type){
if (typeof this.listeners['done'] != 'undefined') {
for(var i=0;i<this.listeners[type].length;i++){
if (typeof this.listeners.done !== 'undefined') {
for(i=0;i<this.listeners[type].length;i++){
this.listeners[type][i](data);
}
}
}else{
for(var i=0;i<this.typelessListeners.length;i++){
for(i=0;i<this.typelessListeners.length;i++){
this.typelessListeners[i](data);
}
}
@ -112,7 +122,7 @@ OC.EventSource.prototype={
this.listeners[type].push(callback);
}else{
this.source.addEventListener(type,function(e){
if (typeof e.data != 'undefined') {
if (typeof e.data !== 'undefined') {
callback(JSON.parse(e.data));
} else {
callback('');
@ -120,12 +130,13 @@ OC.EventSource.prototype={
},false);
}
}else{
typelessListeners.push(callback);
this.typelessListeners.push(callback);
}
}
},
close:function(){
if (typeof this.source !='undefined') {
this.closed = true;
if (typeof this.source !== 'undefined') {
this.source.close();
}
}