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

Fix JSHint errors in EventSource class

This commit is contained in:
Vincent Petry 2014-07-02 21:32:55 +02:00
parent 012abbad44
commit 8ef8ef1096
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/js/eventsource.js
View File

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