Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-07-21 02:29:23 +00:00
Code Issues Projects Releases Wiki Activity

refactor(dom) loadSocket: socket -> dom

Browse source
This commit is contained in:
coderaiser 2014-06-02 03:36:04 -04:00
parent c293b301bd
commit e673c45241
2 changed files with 29 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/client/dom.js
View file

@ -361,6 +361,30 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog;
});
};
this.loadSocket = function(callback) {
CloudCmd.getConfig(function(config) {
var load = DOM.load,
urlLocal = '/socket.io/socket.io.js',
urlCDN = 'https://cdn.socket.io/socket.io-1.0.0.js',
online = config.online && navigator.onLine,
funcON = function() {
load.js(urlCDN, {
onload : callback,
onerror : funcOFF
});
},
funcOFF = function() {
load.js(urlLocal, {
onload : callback
});
};
Util.exec.if(online, funcON, funcOFF);
});
};
/** function loads css and js of Menu
* @param callback
*/

38
lib/client/socket.js
View file

@ -10,14 +10,10 @@ var CloudCmd, Util, DOM, CloudFunc, io;
var Socket = Util.exec.bind(Util),
AllListeners = {},
socket,
exec = Util.exec,
log = Util.log.bind(Util),
CONNECTED = 'socket connected\n',
DISCONNECTED = 'socket disconnected\n',
ERROR_MSG = 'could not connect to socket.io\n'+
'npm i socket.io';
DISCONNECTED = 'socket disconnected\n';
Socket.on = addListener;
Socket.addListener = addListener;
@ -29,35 +25,11 @@ var CloudCmd, Util, DOM, CloudFunc, io;
Socket.DISCONNECTED = DISCONNECTED;
function init(callback) {
var loadSocket = function(isRemote) {
var urlLocal = '/socket.io/socket.io.js',
urlCDN = 'https://cdn.socket.io/socket.io-1.0.0.js',
url = isRemote ? urlCDN : urlLocal,
onerror = function() {
log(ERROR_MSG);
if (isRemote)
loadSocket(callback);
},
onload = function() {
exec(callback);
if (!socket)
connect();
};
DOM.load.js(url, {
onerror : exec.with(onerror, callback),
onload : exec.with(onload, callback)
});
};
CloudCmd.getConfig(function(config) {
var isOnline = config.online;
DOM.loadSocket(function() {
Util.exec(callback);
loadSocket(isOnline);
if (!socket)
connect();
});
}