From 1fc64018b289d19aaf199a0286ebe11014dab930 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 29 Jan 2014 06:05:44 -0500 Subject: [PATCH] feature(util) loadOnLoad: pop -> shift - change params order --- lib/client.js | 4 ++-- lib/client/console.js | 10 +++++----- lib/client/edit.js | 4 ++-- lib/client/help.js | 2 +- lib/client/menu.js | 6 +++--- lib/client/storage/_dropbox.js | 6 +++--- lib/client/storage/_filepicker.js | 2 +- lib/client/storage/_gdrive.js | 6 +++--- lib/client/storage/_github.js | 8 ++++---- lib/client/storage/_skydrive.js | 6 +++--- lib/client/storage/_vk.js | 6 +++--- lib/client/view.js | 4 ++-- lib/util.js | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/lib/client.js b/lib/client.js index b055f038..3dc3d1b4 100644 --- a/lib/client.js +++ b/lib/client.js @@ -135,9 +135,9 @@ var Util, DOM, CloudFunc; lCallBack = function() { Util.loadOnLoad([ - Util.retFunc(CloudCmd.route, location.hash), - baseInit, initModules, + baseInit, + Util.retFunc(CloudCmd.route, location.hash), ]); }, lFunc = function(pCallBack) { diff --git a/lib/client/console.js b/lib/client/console.js index 783e8046..95eddfb4 100644 --- a/lib/client/console.js +++ b/lib/client/console.js @@ -23,12 +23,12 @@ var CloudCmd, Util, DOM, CloudFunc, $; Loading = true; Util.loadOnLoad([ - addListeners, - CloudCmd.Socket, - Console.show, - load, - CloudCmd.View, DOM.jqueryLoad, + CloudCmd.View, + load, + Console.show, + CloudCmd.Socket, + addListeners, ]); } diff --git a/lib/client/edit.js b/lib/client/edit.js index 9d8305ad..fb2a8de2 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -25,9 +25,9 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch; function init() { Loading = true; Util.loadOnLoad([ - Edit.show, load, - CloudCmd.View + CloudCmd.View, + Edit.show, ]); } diff --git a/lib/client/help.js b/lib/client/help.js index 1f2e456f..90262abd 100644 --- a/lib/client/help.js +++ b/lib/client/help.js @@ -11,8 +11,8 @@ var CloudCmd, Util, DOM; function init() { Util.loadOnLoad([ - Help.show, CloudCmd.View, + Help.show, ]); } diff --git a/lib/client/menu.js b/lib/client/menu.js index 47ed7ffc..ea93b3c0 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -27,10 +27,10 @@ var CloudCmd, Util, DOM, CloudFunc, $; Position = pPosition; Util.loadOnLoad([ - Menu.show, - setUploadToItemNames, + DOM.jqueryLoad, load, - DOM.jqueryLoad + setUploadToItemNames, + Menu.show ]); Events.addKey( lListener ); diff --git a/lib/client/storage/_dropbox.js b/lib/client/storage/_dropbox.js index c3272289..31caf8ca 100644 --- a/lib/client/storage/_dropbox.js +++ b/lib/client/storage/_dropbox.js @@ -10,10 +10,10 @@ var CloudCmd, Util, DOM, CloudFunc, Dropbox, cb, Client; function init(pCallBack){ Util.loadOnLoad([ - Util.retExec(pCallBack), - getUserData, + load, DropBoxStore.login, - load + getUserData, + Util.retExec(pCallBack) ]); } diff --git a/lib/client/storage/_filepicker.js b/lib/client/storage/_filepicker.js index e1e6e1e5..1d528a10 100644 --- a/lib/client/storage/_filepicker.js +++ b/lib/client/storage/_filepicker.js @@ -6,8 +6,8 @@ var CloudCmd, Util, DOM, $, filepicker; var FilePicker = function(pCallBack) { function init(pCallBack) { Util.loadOnLoad([ + load, Util.retExec(pCallBack), - load ]); } diff --git a/lib/client/storage/_gdrive.js b/lib/client/storage/_gdrive.js index 114d523e..5cfbc176 100644 --- a/lib/client/storage/_gdrive.js +++ b/lib/client/storage/_gdrive.js @@ -99,9 +99,9 @@ var CloudCmd, Util, DOM, gapi; GDrive.init = function(pCallBack){ - Util.loadOnLoad([ - Util.retExec(pCallBack), - load + Util.loadOnLoad([ + load, + Util.retExec(pCallBack) ]); }; diff --git a/lib/client/storage/_github.js b/lib/client/storage/_github.js index 06258d87..7f375f8c 100644 --- a/lib/client/storage/_github.js +++ b/lib/client/storage/_github.js @@ -141,16 +141,16 @@ var CloudCmd, Util, DOM, $, Github, cb; GitHubStore.init = function(pCallBack){ Util.loadOnLoad([ - Util.retExec(pCallBack), - GitHubStore.getUserData, + load, GitHubStore.autorize, - load + GitHubStore.getUserData, + Util.retExec(pCallBack) ]); GitHubStore.callback = function(){ Util.loadOnLoad([ - Util.retExec(pCallBack), GitHubStore.getUserData, + Util.retExec(pCallBack) ]); }; }; diff --git a/lib/client/storage/_skydrive.js b/lib/client/storage/_skydrive.js index 874f16e8..e1b0c583 100644 --- a/lib/client/storage/_skydrive.js +++ b/lib/client/storage/_skydrive.js @@ -66,10 +66,10 @@ var CloudCmd, Util, DOM, WL; } SkyDrive.init = function(pCallBack){ - Util.loadOnLoad([ - Util.retExec(pCallBack), + Util.loadOnLoad([ + load, auth, - load + Util.retExec(pCallBack) ]); }; diff --git a/lib/client/storage/_vk.js b/lib/client/storage/_vk.js index 27d9d5cf..09826cb3 100644 --- a/lib/client/storage/_vk.js +++ b/lib/client/storage/_vk.js @@ -86,10 +86,10 @@ var CloudCmd, Util, DOM, VK; VKStorage.init = function(pCallBack){ - Util.loadOnLoad([ - Util.retExec(pCallBack), + Util.loadOnLoad([ + load, auth, - load + Util.retExec(pCallBack) ]); }; diff --git a/lib/client/view.js b/lib/client/view.js index 99575a8d..058ac089 100644 --- a/lib/client/view.js +++ b/lib/client/view.js @@ -63,9 +63,9 @@ var CloudCmd, Util, DOM, CloudFunc, $; lFunc = Util.retExec(View.show, null); Util.loadOnLoad([ - lFunc, + DOM.jqueryLoad, load, - DOM.jqueryLoad + lFunc ]); Events.addKey(listener); diff --git a/lib/util.js b/lib/util.js index 36cc4cf8..7f9915ab 100644 --- a/lib/util.js +++ b/lib/util.js @@ -498,7 +498,7 @@ */ this.loadOnLoad = function(funcs, data) { if (Util.isArray(funcs) && funcs.length) { - var func = funcs.pop(), + var func = funcs.shift(), callback = function(pData) { return Util.loadOnLoad(funcs, data); };