diff --git a/lib/client/dom.js b/lib/client/dom.js index b45f40b2..b8abf4c4 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -333,56 +333,50 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; return ret; } - /** - * load jquery from google cdn or local copy - * @param callback - */ - this.loadJquery = function(callback) { - CloudCmd.getConfig(function(config) { - var load = DOM.load, - - url = '/lib/client/jquery.js', - online = config.online && navigator.onLine, - - funcON = function() { - load.jquery({ - onload : callback, - onerror : funcOFF - }); - }, - - funcOFF = function() { - load.js(url, { - onload : callback - }); - }; - - Util.exec.if(online, funcON, funcOFF); - }); - }; - - this.loadSocket = function(callback) { + function loadRemote(url, callback) { + Util.checkArgs(arguments, ['url', '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', + + local = url.local, + remote = url.remote, + online = config.online && navigator.onLine, funcON = function() { - load.js(urlCDN, { + load.js(remote, { onload : callback, onerror : funcOFF }); }, funcOFF = function() { - load.js(urlLocal, { + load.js(local, { onload : callback }); }; Util.exec.if(online, funcON, funcOFF); }); + } + + /** + * load jquery from google cdn or local copy + * @param callback + */ + this.loadJquery = function(callback) { + loadRemote({ + local : '/lib/client/jquery.js', + remote : '//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js' + }, callback); + }; + + this.loadSocket = function(callback) { + loadRemote({ + local : '/socket.io/socket.io.js', + remote : 'https://cdn.socket.io/socket.io-1.0.0.js' + }, callback); }; /** function loads css and js of Menu