diff --git a/lib/client/analytics.js b/lib/client/analytics.js index 993ef3e7..d226b214 100644 --- a/lib/client/analytics.js +++ b/lib/client/analytics.js @@ -11,6 +11,6 @@ var DOM, _gaq; navigator.userAgent + ' -> ' + url + ' : ' + line]); }); - DOM.jsload('//google-analytics.com/ga.js'); + DOM.load.js('//google-analytics.com/ga.js'); })(DOM, _gaq); diff --git a/lib/client/contact.js b/lib/client/contact.js index 79778550..759e2cd7 100644 --- a/lib/client/contact.js +++ b/lib/client/contact.js @@ -36,9 +36,7 @@ var CloudCmd, Util, DOM, olark; Images.showLoad({top: true}); - DOM.jsload(path, function() { - Util.exec(callback); - }); + DOM.load.js(path, callback); } function show() { diff --git a/lib/client/listeners.js b/lib/client/listeners.js index 7877ba86..63af056a 100644 --- a/lib/client/listeners.js +++ b/lib/client/listeners.js @@ -30,7 +30,7 @@ var Util, DOM, CloudCmd; url = CloudCmd.LIBDIRCLIENT + 'analytics.js'; setTimeout(function() { - DOM.jsload(url); + DOM.load.js(url); }, FIVE_SECONDS); }); } diff --git a/lib/client/storage/_dropbox.js b/lib/client/storage/_dropbox.js index 48ae65fd..71c68430 100644 --- a/lib/client/storage/_dropbox.js +++ b/lib/client/storage/_dropbox.js @@ -35,7 +35,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dropbox, cb, Client; Util.exec(callback); }; - DOM.jsload(lSrc, { + DOM.load.js(lSrc, { onload : lOnload, error : DOM.retJSLoad(lLocal, lOnload) }); diff --git a/lib/client/storage/_filepicker.js b/lib/client/storage/_filepicker.js index e6ce06c9..96d599b9 100644 --- a/lib/client/storage/_filepicker.js +++ b/lib/client/storage/_filepicker.js @@ -48,7 +48,7 @@ var CloudCmd, Util, DOM, filepicker; function load(callback) { Util.time('filepicker load'); - DOM.jsload('//api.filepicker.io/v1/filepicker.js', function() { + DOM.load.js('//api.filepicker.io/v1/filepicker.js', function() { CloudCmd.getModules(function(modules) { var storage = Util.findObjByNameInArr(modules, 'storage'), picker = Util.findObjByNameInArr(storage, 'FilePicker'), diff --git a/lib/client/storage/_gdrive.js b/lib/client/storage/_gdrive.js index a1af7938..a63627e8 100644 --- a/lib/client/storage/_gdrive.js +++ b/lib/client/storage/_gdrive.js @@ -15,8 +15,8 @@ var CloudCmd, Util, DOM, gapi; /* https://code.google.com/p/google-api-javascript-client/ */ var lUrl = 'https://apis.google.com/js/client.js'; - DOM.jsload(lUrl, function(){ - CloudCmd.getModules(function(modules){ + DOM.load.js(lUrl, function() { + CloudCmd.getModules(function(modules) { var storage = Util.findObjByNameInArr(modules, 'storage'), gDrive = Util.findObjByNameInArr(storage, 'GDrive'), gDriveId = gDrive && gDrive.id, diff --git a/lib/client/storage/_github.js b/lib/client/storage/_github.js index c3bccc97..46b03b89 100644 --- a/lib/client/storage/_github.js +++ b/lib/client/storage/_github.js @@ -42,7 +42,7 @@ var CloudCmd, Util, DOM, CloudFunc, Github, cb; Util.time('github'); - DOM.jsload(url, function() { + DOM.load.js(url, function() { Util.timeEnd('github'); DOM.Images.hide(); diff --git a/lib/client/storage/_skydrive.js b/lib/client/storage/_skydrive.js index 02aa3a51..f0f14038 100644 --- a/lib/client/storage/_skydrive.js +++ b/lib/client/storage/_skydrive.js @@ -11,15 +11,15 @@ var CloudCmd, Util, DOM, WL; /** * load google api library */ - function load(pCallBack){ + function load(callback){ console.time('SkyDrive'); var lUrl = '//js.live.net/v5.0/wl.js'; - DOM.jsload(lUrl, function(){ + DOM.load.js(lUrl, function(){ console.timeEnd('SkyDrive load'); DOM.Images.hide(); - Util.exec(pCallBack); + Util.exec(callback); }); } diff --git a/lib/client/storage/_vk.js b/lib/client/storage/_vk.js index 6d4ec9d5..29f4e6c6 100644 --- a/lib/client/storage/_vk.js +++ b/lib/client/storage/_vk.js @@ -24,7 +24,7 @@ var CloudCmd, Util, DOM, VK; Util.exec(pCallBack); }; - DOM.jsload(lUrl, { + DOM.load.js(lUrl, { onload : lOnload, error : DOM.retJSLoad(lLocal, lOnload) });